]>
Commit | Line | Data |
---|---|---|
bc7a96a8 DA |
1 | diff_cmd () { |
2 | "$merge_tool_path" \ | |
3 | -R 'Accel.Search: "Ctrl+F"' \ | |
6cf5f6ce | 4 | -R 'Accel.SearchForward: "Ctrl+G"' \ |
bc7a96a8 | 5 | "$LOCAL" "$REMOTE" |
571f4348 DA |
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 | |
bc7a96a8 DA |
13 | } |
14 | ||
980145f7 FR |
15 | diff_cmd_help () { |
16 | echo "Use xxdiff (requires a graphical session)" | |
17 | } | |
18 | ||
bc7a96a8 | 19 | merge_cmd () { |
bc7a96a8 DA |
20 | if $base_present |
21 | then | |
22 | "$merge_tool_path" -X --show-merged-pane \ | |
6cf5f6ce | 23 | -R 'Accel.SaveAsMerged: "Ctrl+S"' \ |
bc7a96a8 | 24 | -R 'Accel.Search: "Ctrl+F"' \ |
6cf5f6ce | 25 | -R 'Accel.SearchForward: "Ctrl+G"' \ |
bc7a96a8 DA |
26 | --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE" |
27 | else | |
28 | "$merge_tool_path" -X $extra \ | |
6cf5f6ce | 29 | -R 'Accel.SaveAsMerged: "Ctrl+S"' \ |
bc7a96a8 | 30 | -R 'Accel.Search: "Ctrl+F"' \ |
6cf5f6ce | 31 | -R 'Accel.SearchForward: "Ctrl+G"' \ |
bc7a96a8 DA |
32 | --merged-file "$MERGED" "$LOCAL" "$REMOTE" |
33 | fi | |
bc7a96a8 | 34 | } |
980145f7 FR |
35 | |
36 | merge_cmd_help () { | |
37 | echo "Use xxdiff (requires a graphical session)" | |
38 | } |