Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax

* 'rs/use-modern-git-merge-syntax' of git-gui: git-gui: stop using deprecated merge syntax

Junio C Hamano committed Sep 26, 2016 at 07:16 UTC ff65e796f00097c118a85ac40e51405080e98627

No changes.