Merge branch 'jk/describe-omit-some-refs' into maint
[git] / 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         if $base_present
10         then
11                 "$merge_tool_path" -X --show-merged-pane \
12                         -R 'Accel.SaveAsMerged: "Ctrl+S"' \
13                         -R 'Accel.Search: "Ctrl+F"' \
14                         -R 'Accel.SearchForward: "Ctrl+G"' \
15                         --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
16         else
17                 "$merge_tool_path" -X $extra \
18                         -R 'Accel.SaveAsMerged: "Ctrl+S"' \
19                         -R 'Accel.Search: "Ctrl+F"' \
20                         -R 'Accel.SearchForward: "Ctrl+G"' \
21                         --merged-file "$MERGED" "$LOCAL" "$REMOTE"
22         fi
23 }