diff options
Diffstat (limited to 'mergetools/xxdiff')
| -rw-r--r-- | mergetools/xxdiff | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/mergetools/xxdiff b/mergetools/xxdiff index ce5b8e9..cd205f9 100644 --- a/mergetools/xxdiff +++ b/mergetools/xxdiff @@ -3,6 +3,17 @@ diff_cmd () { -R 'Accel.Search: "Ctrl+F"' \ -R 'Accel.SearchForward: "Ctrl+G"' \ "$LOCAL" "$REMOTE" + + # xxdiff can segfault on binary files which are often uninteresting. + # Do not allow segfaults to stop us from continuing on to the next file. + if test $? = 128 + then + return 1 + fi +} + +diff_cmd_help () { + echo "Use xxdiff (requires a graphical session)" } merge_cmd () { @@ -21,3 +32,7 @@ merge_cmd () { --merged-file "$MERGED" "$LOCAL" "$REMOTE" fi } + +merge_cmd_help () { + echo "Use xxdiff (requires a graphical session)" +} |