diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:42 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:32:37 -0700 |
| commit | d09c0a3935c6f28b1e7710f3f08a6ff5dec50f73 (patch) | |
| tree | 61e88e48061b4ab2e0f53c33637a2e8683411e70 /merge-file.c | |
| parent | t6022: Add tests for rename/rename combined with D/F conflicts (diff) | |
| download | tgif-d09c0a3935c6f28b1e7710f3f08a6ff5dec50f73.tar.xz | |
t6020: Modernize style a bit
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions