diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:43 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:32:37 -0700 |
| commit | fa0ae3b1ddeeb8c872f3804950fa95b5fc8b4138 (patch) | |
| tree | 91993f4254494db14edbeb88dd7f066f90d4dd8a /sha1_file.c | |
| parent | t6020: Modernize style a bit (diff) | |
| download | tgif-fa0ae3b1ddeeb8c872f3804950fa95b5fc8b4138.tar.xz | |
t6020: Add a testcase for modify/delete + directory/file conflict
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions