git-gui: show unstaged symlinks in diff viewer

[git.git] / lib / merge.tcl

diff --git a/lib/merge.tcl b/lib/merge.tcl
index 66d1bcd8263e4a346993d9cfa99cbde080959a7b..0e50919d4c272e1e071e08c58b30d2c688c8d111 100644 (file)
--- a/lib/merge.tcl
+++ b/lib/merge.tcl
@@ -90,9 +90,6 @@ method _start {} {
 
        set spec [$w_rev get_tracking_branch]
        set cmit [$w_rev get_commit]
-       set cmd [list git]
-       lappend cmd merge
-       lappend cmd --strategy=recursive
 
        set fh [open [gitdir FETCH_HEAD] w]
        fconfigure $fh -translation lf
@@ -112,9 +109,12 @@ method _start {} {
        puts $fh "$cmit\t\tbranch '$branch' of $remote"
        close $fh
 
+       set cmd [list git]
+       lappend cmd merge
+       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..."