diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:08:25 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 12:08:25 -0700 |
commit | 4cd1b99c32d9a345438d098f37e75077d072778f (patch) | |
tree | dead0a8c55e9d812224c8966290249cb85aecd53 /ppc/sha1.h | |
parent | Merge branch 'ns/merge-recursive-uptodate' (diff) | |
parent | diff A...B: give one possible diff when there are more than one merge-base (diff) | |
download | tgif-4cd1b99c32d9a345438d098f37e75077d072778f.tar.xz |
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 'ppc/sha1.h')
0 files changed, 0 insertions, 0 deletions