From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Mon, 3 Oct 2016 22:23:19 +0000 (+0100)
Subject: Merge branch 'rs/use-modern-git-merge-syntax' into pu
X-Git-Tag: gitgui-0.21.0~11
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=9613644a310980beaaafc84f20e55520818b89b0;p=thirdparty%2Fgit.git

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

9613644a310980beaaafc84f20e55520818b89b0