diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-17 12:40:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-17 12:40:45 -0700 |
| commit | f3bd6ab7ea7b35ca5f26f106eb00a00f257716d7 (patch) | |
| tree | 91956e5a6a412502376f1d54009c9d23e213074a /merge-recursive.h | |
| parent | t6006: do not write to /tmp (diff) | |
| parent | t1010-mktree: Adjust expected result to code and documentation (diff) | |
| download | tgif-f3bd6ab7ea7b35ca5f26f106eb00a00f257716d7.tar.xz | |
Merge branch 'maint'
* maint:
t1010-mktree: Adjust expected result to code and documentation
combined diff: correctly handle truncated file
Document new "already-merged" rule for branch -d
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions