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	git-gui 0.20.0	2015-04-18 18:35:48 -07:00
po	Merge branch 'sy/i18n' of git-gui	2016-09-07 10:24:25 -07:00
windows	git-gui 0.19.0	2014-01-21 13:16:17 -08:00
.gitattributes	Merge branch 'master' of git://repo.or.cz/git-gui	2011-12-13 16:48:24 -08:00
.gitignore
git-gui--askpass
git-gui.sh	git-gui 0.20.0	2015-04-18 18:35:48 -07:00
GIT-VERSION-GEN	git-gui 0.20.0	2015-04-18 18:35:48 -07:00
Makefile	git-gui 0.20.0	2015-04-18 18:35:48 -07:00