mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 21:43:58 +01:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
157 Commits 6 Branches 956 Tags 311 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
f70c3a2cac
Go to file
Shawn O. Pearce f70c3a2cac 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>
2006-11-27 00:48:49 -05:00
git-citool git-gui: Finished commit implementation. 2006-11-07 03:05:17 -05:00
git-gui git-gui: Enable resolution of merge conflicts. 2006-11-27 00:48:49 -05:00
Makefile git-gui: Created makefile to install the program. 2006-11-17 23:56:14 -05:00
TODO git-gui: Updated todo list. 2006-11-25 23:16:16 -05:00