Merge branch 'jc/merge-drop-old-syntax'
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Mar 2017 21:07:13 +0000 (14:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Mar 2017 21:07:13 +0000 (14:07 -0700)
commit1fdbfc4...3e9ef702df9a305231e15f020920c87a
tree0eb966f...e70b1a273ba873b93a5333b44eb28909copy hash to clipboard (tree)
parente1104a5...e539408b81566066aaa6963cb87d5cd6copy hash to clipboard (diff)
parentb439165...ed96c8dd2881d5c9fcad39a07d8cb92acopy hash to clipboard (diff)
Documentation/git-merge.txt
builtin/merge.c