Merge branch 'jc/diff-merge-base-multi'
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Jul 2010 22:45:35 +0000 (15:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Jul 2010 22:45:35 +0000 (15:45 -0700)
* jc/diff-merge-base-multi:
  diff A...B: do not limit the syntax too narrowly

1  2 
builtin/diff.c

diff --cc builtin/diff.c
Simple merge