git.oblomov.eu Git - git/blob - mergetools/xxdiff

   1 diff_cmd () {
   2         "$merge_tool_path" \
   3                 -R 'Accel.Search: "Ctrl+F"' \
   4                 -R 'Accel.SearchForward: "Ctrl-G"' \
   5                 "$LOCAL" "$REMOTE"
   6 }
   7
   8 merge_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 }