From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Oct 2016 21:20:37 +0000 (-0700)
Subject: Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maint
X-Git-Tag: v2.10.2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0bc409dab941d7df065c486342cefcde78647c42;p=thirdparty%2Fgit.git

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
---

0bc409dab941d7df065c486342cefcde78647c42