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         # xxdiff can segfault on binary files which are often uninteresting.
   8         # Do not allow segfaults to stop us from continuing on to the next file.
   9         if test $? = 128
  10         then
  11                 return 1
  12         fi
  13 }
  14
  15 merge_cmd () {
  16         if $base_present
  17         then
  18                 "$merge_tool_path" -X --show-merged-pane \
  19                         -R 'Accel.SaveAsMerged: "Ctrl+S"' \
  20                         -R 'Accel.Search: "Ctrl+F"' \
  21                         -R 'Accel.SearchForward: "Ctrl+G"' \
  22                         --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
  23         else
  24                 "$merge_tool_path" -X $extra \
  25                         -R 'Accel.SaveAsMerged: "Ctrl+S"' \
  26                         -R 'Accel.Search: "Ctrl+F"' \
  27                         -R 'Accel.SearchForward: "Ctrl+G"' \
  28                         --merged-file "$MERGED" "$LOCAL" "$REMOTE"
  29         fi
  30 }