From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Jul 2010 19:08:25 +0000 (-0700)
Subject: Merge branch 'jc/diff-merge-base-multi'
X-Git-Tag: v1.7.2~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4cd1b99c32d9a345438d098f37e75077d072778f;p=git.git

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
---

4cd1b99c32d9a345438d098f37e75077d072778f