git-gui: Allow git-merge to use branch names in conflict markers

diff --git a/lib/merge.tcl b/lib/merge.tcl
index 5de0d82b1486ef6ff8ce0eaea4221fa393a87d5b..0e50919d4c272e1e071e08c58b30d2c688c8d111 100644 (file)
--- a/lib/merge.tcl
+++ b/lib/merge.tcl
@@ -114,7 +114,7 @@ method _start {} {
        lappend cmd --strategy=recursive
        lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]]
        lappend cmd HEAD
-       lappend cmd $cmit
+       lappend cmd $name
 
        set msg "Merging $current_branch and $stitle"
        ui_status "$msg..."