summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Alexander Kuleshov <kuleshovmail@gmail.com>2015-01-09 13:48:40 +0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-01-09 16:23:41 -0800
commita2681d2bacaf01cb769363ada8fd87507ee7b08f (patch)
treede8cdacdf1b9f6fb54becd4518ef4256c880c33d /builtin/merge-file.c
parentMerge branch 'maint-2.1' into maint (diff)
downloadtgif-a2681d2bacaf01cb769363ada8fd87507ee7b08f.tar.xz
Documentation: list long options for -v and -n
Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions