[PATCH 2/3] mergetool--lib: Add diffuse as a tool

[Alexey Shumkin]

Signed-off-by: Alexey Shumkin <alex.crez...@gmail.com>
---
 git-gui/lib/mergetool.tcl | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl
index 4fc1cab..837ce17 100644
--- a/git-gui/lib/mergetool.tcl
+++ b/git-gui/lib/mergetool.tcl
@@ -194,6 +194,15 @@ proc merge_resolve_tool2 {} {
                        set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" 
-mergeoutput="$MERGED"]
                }
        }
+       diffuse {
+               if {$base_stage ne {}} {
+                       set cmdline [list "$merge_tool_path" \
+                               "$LOCAL" "$MERGED" "$REMOTE" "$BASE"]
+               } else {
+                       set cmdline [list "$merge_tool_path" \
+                               "$LOCAL" "$MERGED" "$REMOTE"]
+               }
+       }
        ecmerge {
                if {$base_stage ne {}} {
                        set cmdline [list "$merge_tool_path" "$BASE" "$LOCAL" 
"$REMOTE" --default --mode=merge3 --to="$MERGED"]
-- 
1.8.1.1.10.g9255f3f

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html