diff options
| author |  Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:49 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:34 -0700 |
| commit | c43ba42e8d3b3b85e322c36d35053f650835ce0a (patch) | |
| tree | fe89b115b489a047bd0cee3fd79d809da5edaa20 /fixup-builtins | |
| parent | t6022: Add testcase for merging a renamed file with a simple change (diff) | |
| download | tgif-c43ba42e8d3b3b85e322c36d35053f650835ce0a.tar.xz | |
merge-recursive: Make BUG message more legible by adding a newline
Hopefully no one ever hits this error except when making large changes to
merge-recursive.c and debugging...
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fixup-builtins')
0 files changed, 0 insertions, 0 deletions