diff options
| author |  Alex Riesen <raa.lkml@gmail.com> | 2009-04-29 23:40:50 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-04-29 18:38:52 -0700 |
| commit | adfd55d51bff3bfcf17c3cd40d0689fb018c14cf (patch) | |
| tree | 57418b8e6ff1c1f05536f759c4845aad31cf5811 /sha1-lookup.c | |
| parent | improve error message in config.c (diff) | |
| download | tgif-adfd55d51bff3bfcf17c3cd40d0689fb018c14cf.tar.xz | |
Clarify kind of conflict in merge-one-file helper
Not as verbose as the recursive merge driver, but better still.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1-lookup.c')
0 files changed, 0 insertions, 0 deletions