Andrew's git / gitweb.git / mergetools/xxdiff
?
mergetools / xxdiffon commit Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude (9fddaf7)
   1diff_cmd () {
   2        "$merge_tool_path" \
   3                -R 'Accel.Search: "Ctrl+F"' \
   4                -R 'Accel.SearchForward: "Ctrl-G"' \
   5                "$LOCAL" "$REMOTE"
   6}
   7
   8merge_cmd () {
   9        touch "$BACKUP"
  10        if $base_present
  11        then
  12                "$merge_tool_path" -X --show-merged-pane \
  13                        -R 'Accel.SaveAsMerged: "Ctrl-S"' \
  14                        -R 'Accel.Search: "Ctrl+F"' \
  15                        -R 'Accel.SearchForward: "Ctrl-G"' \
  16                        --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
  17        else
  18                "$merge_tool_path" -X $extra \
  19                        -R 'Accel.SaveAsMerged: "Ctrl-S"' \
  20                        -R 'Accel.Search: "Ctrl+F"' \
  21                        -R 'Accel.SearchForward: "Ctrl-G"' \
  22                        --merged-file "$MERGED" "$LOCAL" "$REMOTE"
  23        fi
  24        check_unchanged
  25}