summaryrefslogtreecommitdiff
path: root/t/t7003-filter-branch.sh
diff options
context:
space:
mode:
authorLibravatar Alex Riesen <raa.lkml@gmail.com>2009-04-29 23:40:50 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-05-09 00:27:39 -0700
commit718135e3b6b5317f763477f5b0f408d888d79a8e (patch)
treea4f09602d6c5e5511e220b3fdd4d2027d886fe3d /t/t7003-filter-branch.sh
parentgit config: clarify --add and --get-color (diff)
downloadtgif-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/t7003-filter-branch.sh')
0 files changed, 0 insertions, 0 deletions