summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Ralf Thielow <ralf.thielow@gmail.com>2015-01-20 20:30:28 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-01-20 16:12:54 -0800
commitd6589d1ba42dd87c282c72045537f5eea8aaefcf (patch)
tree26724ef3680ad62698d40b15e9ced3b026f13c27 /builtin/merge-ours.c
parentshow-branch: line-wrap show-branch usage (diff)
downloadtgif-d6589d1ba42dd87c282c72045537f5eea8aaefcf.tar.xz
show-branch: fix indentation of usage string
Noticed-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions