Merge branch 'jc/diff-merge-base-multi'
commit24e7a5be373c95f977bab4f0f41f736bb1d25075
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Jul 2010 22:45:35 +0000 (16 15:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Jul 2010 22:45:35 +0000 (16 15:45 -0700)
tree815dbc4e0bb0d528ed9a7e53394b0ffe5b198e84
parent7ea3ddf818dbd59ae8002e98f56e60742746db45
parent7a0e4d7c39083e951625e4c3434d05abfea8f5e6
Merge branch 'jc/diff-merge-base-multi'

* jc/diff-merge-base-multi:
  diff A...B: do not limit the syntax too narrowly
builtin/diff.c