diff options
Diffstat (limited to 'mergetools/bc3')
| -rw-r--r-- | mergetools/bc3 | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/mergetools/bc3 b/mergetools/bc3 new file mode 100644 index 0000000000..b6319d206e --- /dev/null +++ b/mergetools/bc3 @@ -0,0 +1,25 @@ +diff_cmd () { + "$merge_tool_path" "$LOCAL" "$REMOTE" +} + +merge_cmd () { + touch "$BACKUP" + if $base_present + then + "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \ + -mergeoutput="$MERGED" + else + "$merge_tool_path" "$LOCAL" "$REMOTE" \ + -mergeoutput="$MERGED" + fi + check_unchanged +} + +translate_merge_tool_path() { + if type bcomp >/dev/null 2>/dev/null + then + echo bcomp + else + echo bcompare + fi +} |