summaryrefslogtreecommitdiff
path: root/help.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-05 14:24:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-05 14:24:59 -0700
commitb5699d17c3e04a022227fd95106e89f281417dcd (patch)
tree0e771a84698287b0bd16b5e251ee7dfe42eaa939 /help.c
parentMerge git://github.com/git-l10n/git-po into maint (diff)
parentMerge branch 'maint-1.8.2' into maint-1.8.3 (diff)
downloadtgif-b5699d17c3e04a022227fd95106e89f281417dcd.tar.xz
Merge branch 'maint-1.8.3' into maint
* maint-1.8.3: Documentation/git-merge.txt: fix formatting of example block
Diffstat (limited to 'help.c')
0 files changed, 0 insertions, 0 deletions