Junio C Hamano 0bc409dab9 Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maint ... The original command line syntax for "git merge", which was "git merge <msg> HEAD <parent>...", has been deprecated for quite some time, and "git gui" was the last in-tree user of the syntax. This is finally fixed, so that we can move forward with the deprecation. * rs/git-gui-use-modern-git-merge-syntax: git-gui: stop using deprecated merge syntax		2016-10-11 14:20:37 -07:00
..
lib	Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maint	2016-10-11 14:20:37 -07:00
macosx
po
windows
.gitattributes
.gitignore
git-gui--askpass
git-gui.sh
GIT-VERSION-GEN
Makefile