summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-02-26 23:18:38 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-02-27 15:42:05 -0800
commite82447b1dfbda6ecfc101381c1295c444c73c903 (patch)
treea0ed34e150aec9a334a726c3f93ea74121e4e272 /fast-import.c
parentDocumentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest (diff)
downloadtgif-e82447b1dfbda6ecfc101381c1295c444c73c903.tar.xz
Fix "git log --merge --left-right"
The command did not reject the combination of these options, but did not show left/right markers. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fast-import.c')
0 files changed, 0 insertions, 0 deletions