projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge updated git-gui and gitk that call each other
[git.git]
/
git-gui
/
lib
/
commit.tcl
diff --git
a/git-gui/lib/commit.tcl
b/git-gui/lib/commit.tcl
index 40a710355751836e78b65101592b753266f507ca..2977315624fc5deeecff275d8dc8b3f2e3210a70 100644
(file)
--- a/
git-gui/lib/commit.tcl
+++ b/
git-gui/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)}