summaryrefslogtreecommitdiff
path: root/templates/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-27 07:18:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-27 23:42:05 (GMT)
commite82447b1dfbda6ecfc101381c1295c444c73c903 (patch)
treea0ed34e150aec9a334a726c3f93ea74121e4e272 /templates/Makefile
parent81fa145917c40b68a5e2cca6afc6a10cdfdbd25b (diff)
downloadgit-e82447b1dfbda6ecfc101381c1295c444c73c903.zip
git-e82447b1dfbda6ecfc101381c1295c444c73c903.tar.gz
git-e82447b1dfbda6ecfc101381c1295c444c73c903.tar.bz2
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 'templates/Makefile')
0 files changed, 0 insertions, 0 deletions