diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-19 12:40:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-19 12:40:17 -0700 |
| commit | 4f26c39806ee69bd68d6ea04b147eb2d877d0172 (patch) | |
| tree | 205996e02a0d60a2670ceba8d0946afbffa0bb15 /t/t6023-merge-file.sh | |
| parent | fe4ce3a72140d32d82aec860c8eb319a78205de6 (diff) | |
| parent | aadd44404baab7b1f7234c8815bfd1e6c980cd99 (diff) | |
| download | git-4f26c39806ee69bd68d6ea04b147eb2d877d0172.tar.gz git-4f26c39806ee69bd68d6ea04b147eb2d877d0172.tar.xz | |
Merge branch 'ef/maint-fast-export' into maint
* ef/maint-fast-export:
builtin-fast-export.c: handle nested tags
builtin-fast-export.c: fix crash on tagged trees
builtin-fast-export.c: turn error into warning
test-suite: adding a test for fast-export with tag variants
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions