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>
Shawn O. Pearce committed
Nov 26, 2006 at 19:45 UTC
f70c3a2caccf4f0f5abfd3d0db4120e8659dd0d7
1 file changed
+3
git-gui
+3
@@ -1502,10 +1502,13 @@ proc write_update_index {fd pathList totalCnt batch msg after} {
1502
switch -glob -- [lindex $file_states($path) 0] {
1503
AD -
1504
MD -
1505
+ UD -
1506
_D {set new DD}
1507
1508
_M -
1509
MM -
1510
+ UM -
1511
+ U_ -
1512
M_ {set new M_}
1513
1514
_O -