git-gui: Enable resolution of merge conflicts.

diff --git a/git-gui b/git-gui
index 09fc40aaf8e24059f8d2d3632a94011b7407c434..0b0f1e3e7030fb7459af7da18ef827d3d04d58a2 100755 (executable)
--- a/git-gui
+++ b/git-gui
@@ -1502,10 +1502,13 @@ proc write_update_index {fd pathList totalCnt batch msg after} {
                switch -glob -- [lindex $file_states($path) 0] {
                AD -
                MD -
+               UD -
                _D {set new DD}
 
                _M -
                MM -
+               UM -
+               U_ -
                M_ {set new M_}
 
                _O -