From c5f424fd014488bd8a92b97f52bfe47823bc2128 Mon Sep 17 00:00:00 2001 From: Stefan Saasen Date: Sun, 13 Oct 2013 09:29:35 +1100 Subject: mergetools/diffmerge: support DiffMerge as a git mergetool DiffMerge is a non-free (but gratis) tool that supports OS X, Windows and Linux. See http://www.sourcegear.com/diffmerge/ DiffMerge includes a script `/usr/bin/diffmerge` that can be used to launch the graphical compare tool. This change adds mergetool support for DiffMerge and adds 'diffmerge' as an option to the mergetool help. Signed-off-by: Stefan Saasen Acked-by: David Aguilar Signed-off-by: Jonathan Nieder --- mergetools/diffmerge | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 mergetools/diffmerge (limited to 'mergetools') diff --git a/mergetools/diffmerge b/mergetools/diffmerge new file mode 100644 index 0000000000..85ac720157 --- /dev/null +++ b/mergetools/diffmerge @@ -0,0 +1,15 @@ +diff_cmd () { + "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 +} + +merge_cmd () { + if $base_present + then + "$merge_tool_path" --merge --result="$MERGED" \ + "$LOCAL" "$BASE" "$REMOTE" + else + "$merge_tool_path" --merge \ + --result="$MERGED" "$LOCAL" "$REMOTE" + fi + status=$? +} -- cgit v1.2.3