diff options
| author |  Alex Riesen <raa.lkml@gmail.com> | 2009-04-29 23:40:50 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-05-09 00:27:39 -0700 |
| commit | 718135e3b6b5317f763477f5b0f408d888d79a8e (patch) | |
| tree | a4f09602d6c5e5511e220b3fdd4d2027d886fe3d /t/t4013/diff.rev-list_--children_HEAD | |
| parent | git config: clarify --add and --get-color (diff) | |
| download | tgif-718135e3b6b5317f763477f5b0f408d888d79a8e.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 't/t4013/diff.rev-list_--children_HEAD')
0 files changed, 0 insertions, 0 deletions