diff options
| author |  Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:20 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:39 -0700 |
| commit | e03acb8bc1f03827210235dd72578b8b26f19c51 (patch) | |
| tree | fad3ab9d30a872700493276f20c894749191253f /pretty.c | |
| parent | merge-recursive: Make modify/delete handling code reusable (diff) | |
| download | tgif-e03acb8bc1f03827210235dd72578b8b26f19c51.tar.xz | |
merge-recursive: Have conflict_rename_delete reuse modify/delete code
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pretty.c')
0 files changed, 0 insertions, 0 deletions