From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 27 Nov 2006 00:45:39 +0000 (-0500)
Subject: git-gui: Enable resolution of merge conflicts.
X-Git-Tag: gitgui-0.6.0~147
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f70c3a2caccf4f0f5abfd3d0db4120e8659dd0d7;p=git.git

git-gui: Enable resolution of merge conflicts.

If a file has a merge conflict (index state = U) the user will need to
run update-index on that file to resolve all stages down to stage 0,
by including the file in the working directory.

Like core Git we'll just trust the user that their resolution is
correct, and that they didn't just include the file into the commit
while merge conflicts still exist within the file.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-gui b/git-gui
index 09fc40aaf..0b0f1e3e7 100755
--- 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 -