From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Sep 2016 14:16:29 +0000 (-0700)
Subject: Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern... 
X-Git-Tag: v2.10.2~31^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff65e796f00097c118a85ac40e51405080e98627;p=thirdparty%2Fgit.git

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

ff65e796f00097c118a85ac40e51405080e98627