summaryrefslogtreecommitdiff
path: root/t/t4151-am-abort.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-07-15 12:08:25 -0700
committerJunio C Hamano <gitster@pobox.com>2010-07-15 12:08:25 -0700
commit4cd1b99c32d9a345438d098f37e75077d072778f (patch)
treedead0a8c55e9d812224c8966290249cb85aecd53 /t/t4151-am-abort.sh
parenta8b7fcffddc6bce0875775154d6a41a528340d71 (diff)
parentc008c0ff2087da7b98adfa760247776619b32224 (diff)
downloadgit-4cd1b99c32d9a345438d098f37e75077d072778f.tar.gz
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
Diffstat (limited to 't/t4151-am-abort.sh')
0 files changed, 0 insertions, 0 deletions