summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-11-26 19:45:39 -0500
committerShawn O. Pearce <spearce@spearce.org>2006-11-27 00:48:49 -0500
commitf70c3a2caccf4f0f5abfd3d0db4120e8659dd0d7 (patch)
treef72f756978322cc4b31fd91e30b2ee45672bd6e9 /git-gui
parent5e926cbf7eeb2c89e0957bed7941c2c6490767c2 (diff)
downloadgit-f70c3a2caccf4f0f5abfd3d0db4120e8659dd0d7.tar.gz
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>
Diffstat (limited to 'git-gui')
-rwxr-xr-xgit-gui3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-gui b/git-gui
index 09fc40aaf8..0b0f1e3e70 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 -