diff options
Diffstat (limited to 'mergetools/tortoisemerge')
| -rw-r--r-- | mergetools/tortoisemerge | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge new file mode 100644 index 0000000..ed7db49 --- /dev/null +++ b/mergetools/tortoisemerge @@ -0,0 +1,17 @@ +can_diff () { + return 1 +} + +merge_cmd () { + if $base_present + then + touch "$BACKUP" + "$merge_tool_path" \ + -base:"$BASE" -mine:"$LOCAL" \ + -theirs:"$REMOTE" -merged:"$MERGED" + check_unchanged + else + echo "TortoiseMerge cannot be used without a base" 1>&2 + return 1 + fi +} |