From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 1 Dec 2009 20:47:01 +0000 (-0800)
Subject: Merge branch 'jc/deprecate-old-syntax-from-merge'
X-Git-Tag: v1.6.6-rc1~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=36a83f375bc247a09f46de0445a138d5e6de8a4f;p=git.git

Merge branch 'jc/deprecate-old-syntax-from-merge'

* jc/deprecate-old-syntax-from-merge:
  git-merge: a deprecation notice of the ancient command line syntax
---

36a83f375bc247a09f46de0445a138d5e6de8a4f