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