Code

Merge branch 'jc/deprecate-old-syntax-from-merge'
authorJunio C Hamano <gitster@pobox.com>
Tue, 1 Dec 2009 20:47:01 +0000 (12:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Dec 2009 20:47:01 +0000 (12:47 -0800)
commit36a83f375bc247a09f46de0445a138d5e6de8a4f
treee64aafa7ba59dedb651aa79b4b96483b855089af
parent4a2775974ae47b69768b6bf5c5c75539409bb289
parentb81e00a965c62ca72a4b9db425ee173de147808d
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
builtin-merge.c