tree dead0a8c55e9d812224c8966290249cb85aecd53
parent a8b7fcffddc6bce0875775154d6a41a528340d71
parent c008c0ff2087da7b98adfa760247776619b32224
author Junio C Hamano <gitster@pobox.com> 1279220905 -0700
committer Junio C Hamano <gitster@pobox.com> 1279220905 -0700

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