diff options
Diffstat (limited to 'mergetools/meld')
| -rw-r--r-- | mergetools/meld | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mergetools/meld b/mergetools/meld new file mode 100644 index 0000000000..73d70ae28a --- /dev/null +++ b/mergetools/meld @@ -0,0 +1,9 @@ +diff_cmd () { + "$merge_tool_path" "$LOCAL" "$REMOTE" +} + +merge_cmd () { + touch "$BACKUP" + "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" + check_unchanged +} |