From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Oct 2016 20:30:36 +0000 (-0700)
Subject: Merge branch 'rs/git-gui-use-modern-git-merge-syntax'
X-Git-Tag: v2.11.0-rc0~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a2c86fb08cc195ca39d82e2c2d84158f05b96fc;p=thirdparty%2Fgit.git

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

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

5a2c86fb08cc195ca39d82e2c2d84158f05b96fc