X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=lib%2Fcommit.tcl;h=2977315624fc5deeecff275d8dc8b3f2e3210a70;hb=b2ca414973c3bcd00f2b94538bd9c755387f30a0;hp=40a710355751836e78b65101592b753266f507ca;hpb=f4d93486aea3a3c20ddef409e5bfd8a60efdc512;p=git.git diff --git a/lib/commit.tcl b/lib/commit.tcl index 40a710355..297731562 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -149,7 +149,9 @@ The rescan will be automatically started now. _? {continue} A? - D? - + T_ - M? {set files_ready 1} + _U - U? { error_popup [mc "Unmerged files cannot be committed. @@ -428,6 +430,7 @@ A rescan will be automatically started now. __ - A_ - M_ - + T_ - D_ { unset file_states($path) catch {unset selected_paths($path)}