Lines Matching +full:- +full:qe

10   -t, --tool {bcompare,meld,vimdiff}
23   rm -rf "${TEMP_FILES[@]}"
29     set -x
43   if grep -qE "${CONFLICT_MARKER_BASE}" "$file"; then
47   $has_base && awk -f "$SPLIT3" -v TARGET=BASE <"$file" >"$BASE"
48   awk -f "$SPLIT3" -v TARGET=LOCAL <"$file" >"$LOCAL"
49   awk -f "$SPLIT3" -v TARGET=REMOTE <"$file" >"$REMOTE"
54         xtrace bcompare "$LOCAL" "$REMOTE" "$BASE" -mergeoutput="$MERGED"
56         xtrace bcompare "$LOCAL" "$REMOTE" -mergeoutput="$MERGED"
61         xtrace meld "$LOCAL" "$BASE" "$REMOTE" -o "$MERGED"
68         xtrace vimdiff -c '4wincmd w | wincmd J' "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
70         xtrace vimdiff -c 'wincmd l' "$LOCAL" "$MERGED" "$REMOTE"
81 if [[ -n "$DISPLAY" ]]; then
82   if command -v bcompare; then
84   elif command -v meld; then
89 while [[ "$1" =~ ^- ]]; do
93     --) break ;;
94     -t | --tool)
98     -h | --help | --usage)
110 if git rev-parse >/dev/null 2>/dev/null; then
122 if [[ "${#}" -eq 0 ]]; then
123   while IFS= read -r -d '' ARG; do
125   done < <(git -c grep.fallbackToNoIndex=true grep -zlE "$CONFLICT_MARKER_BEGIN" 2>/dev/null)
132   if ! [[ -f "$file" ]] || [[ -L "$file" ]]; then
134   elif ! grep -qE "$CONFLICT_MARKER_BEGIN" "$file"; then
150   if [[ "$exit_code" -ne 0 ]]; then
154   if $TRUST_EXIT_CODE && [[ "$exit_code" -eq 0 ]]; then
155     if [[ -n "$(git ls-files "$file")" ]]; then
160   read -r -p "Continue merging other files? [Y/n]" -n 1 yn || exit