summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-11-15 16:38:36 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-15 16:38:36 -0800
commit69abb194eed5b2f06590d0145e4034300c3e7ac9 (patch)
tree196670d23d31d28c88e56ffed5b558277c6a9dbb /builtin-merge-file.c
parentMerge branch 'ja/fetch-doc' into maint (diff)
parentQuote ' as \(aq in manpages (diff)
downloadtgif-69abb194eed5b2f06590d0145e4034300c3e7ac9.tar.xz
Merge branch 'tr/maint-roff-quote' into maint
* tr/maint-roff-quote: Quote ' as \(aq in manpages
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions