diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-30 00:03:52 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-30 00:03:52 -0700 |
commit | bcb477fb60dc3e7c75a0c2870b106afeb21ae5d2 (patch) | |
tree | f766e0c08f08560d53336a2ee8fa469d9f877c70 /t/t6020-merge-df.sh | |
parent | Merge branch 'jn/run-command-error-failure' into maint (diff) | |
parent | Documentation/technical/api-diff.txt: correct name of diff_unmerge() (diff) | |
download | tgif-bcb477fb60dc3e7c75a0c2870b106afeb21ae5d2.tar.xz |
Merge branch 'bc/maint-api-doc-parked' into maint
* bc/maint-api-doc-parked:
Documentation/technical/api-diff.txt: correct name of diff_unmerge()
Diffstat (limited to 't/t6020-merge-df.sh')
0 files changed, 0 insertions, 0 deletions