summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Wieland Hoffmann <themineo@gmail.com>2014-10-04 18:27:16 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-07 11:08:06 -0700
commiteeff891ac756fd97a05476446f15269b714ce4cc (patch)
tree540aae001774c52ace3c59477a3cb313b6476bad /builtin/merge-file.c
parentDocumentation: fix missing text for rev-parse --verify (diff)
downloadtgif-eeff891ac756fd97a05476446f15269b714ce4cc.tar.xz
git-tag.txt: Add a missing hyphen to `-s`
Signed-off-by: Wieland Hoffmann <themineo@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