diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-11-16 00:02:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-16 00:02:44 -0800 |
| commit | 5e9cb8666bae6a5c8adcb26e3f46b8a5fe5be589 (patch) | |
| tree | 469a68e905236e91ac77d470d37ef6ae63617278 /t/t6024-recursive-merge.sh | |
| parent | Merge branch 'js/maint-diff-color-words' into maint (diff) | |
| parent | add-interactive: handle deletion of empty files (diff) | |
| download | tgif-5e9cb8666bae6a5c8adcb26e3f46b8a5fe5be589.tar.xz | |
Merge branch 'jk/maint-add-p-empty' into maint
* jk/maint-add-p-empty:
add-interactive: handle deletion of empty files
Diffstat (limited to 't/t6024-recursive-merge.sh')
0 files changed, 0 insertions, 0 deletions