Code

Merge branch 'jc/diff-merge-base-multi'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Jul 2010 19:08:25 +0000 (12:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Jul 2010 19:08:25 +0000 (12:08 -0700)
commit4cd1b99c32d9a345438d098f37e75077d072778f
treedead0a8c55e9d812224c8966290249cb85aecd53
parenta8b7fcffddc6bce0875775154d6a41a528340d71
parentc008c0ff2087da7b98adfa760247776619b32224
Merge branch 'jc/diff-merge-base-multi'

* jc/diff-merge-base-multi:
  diff A...B: give one possible diff when there are more than one merge-base
builtin/diff.c