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