git-merge: document but discourage the historical syntax
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Oct 2007 18:54:11 +0000 (11:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Oct 2007 23:33:55 +0000 (16:33 -0700)
commitdee48c3...7ed7f7a32a524e8a492c6bc4e3c1c78d
tree54c57ac...544d2fbbe9a2d1d34c676c3d31625548copy hash to clipboard (tree)
parentb6c9fb5...00f8cd4081f1c6df5aea7335a11e9659copy hash to clipboard (diff)
Documentation/git-merge.txt