git-gui: Support conflict states _U & UT.

diff --git a/lib/commit.tcl b/lib/commit.tcl
index f4ab70784c9beb3b155bc27e41a9f7d483ec6708..2977315624fc5deeecff275d8dc8b3f2e3210a70 100644 (file)
--- a/lib/commit.tcl
+++ b/lib/commit.tcl
@@ -151,6 +151,7 @@ The rescan will be automatically started now.
                D? -
                T_ -
                M? {set files_ready 1}
+               _U -
                U? {
                        error_popup [mc "Unmerged files cannot be committed.