Shawn O. Pearce 84f67537b1 git-gui: Minor refactoring of merge command line in merge support ... This is just a small code movement to cleanup how we generate the command line for a merge. I'm only doing it to make the next series of changes slightly more readable. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>		2007-07-29 23:44:52 -04:00
lib	git-gui: Minor refactoring of merge command line in merge support	2007-07-29 23:44:52 -04:00
.gitignore	git-gui: Refactor into multiple files to save my sanity	2007-05-07 23:35:48 -04:00
git-gui.sh	git-gui: Use more modern looking icons in the tree browser	2007-07-29 23:44:52 -04:00
GIT-VERSION-GEN	Merge branch 'maint'	2007-06-11 19:06:15 -04:00
Makefile	Merge branch 'maint'	2007-06-27 00:36:38 -04:00