diff options
| author | Sebastian Schuberth <sschuberth@gmail.com> | 2011-02-26 11:52:17 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-27 00:47:34 -0800 |
| commit | f3768a6714e667205d68475df37a889abb59d2d5 (patch) | |
| tree | f949be675c433cbe14f59b9779b8d3184347dcdf | |
| parent | 0e0f450427a915f8569dc3dcc0ce7ee48bba9da9 (diff) | |
| download | git-f3768a6714e667205d68475df37a889abb59d2d5.tar.gz | |
mergetool--lib: Add Beyond Compare 3 as a tool
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | lib/mergetool.tcl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl index 249e0cfa93..3c8e73bceb 100644 --- a/lib/mergetool.tcl +++ b/lib/mergetool.tcl @@ -187,6 +187,13 @@ proc merge_resolve_tool2 {} { "$LOCAL" "$REMOTE" "$MERGED"] } } + bc3 { + if {$base_stage ne {}} { + set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -mergeoutput="$MERGED"] + } else { + set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" -mergeoutput="$MERGED"] + } + } ecmerge { if {$base_stage ne {}} { set cmdline [list "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --default --mode=merge3 --to="$MERGED"] |