summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Thomas Ackermann <th.acker@arcor.de>2014-01-11 17:28:25 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-13 11:18:34 -0800
commitebba6c0ca617352ceef5caa636ab243f0ef14cc3 (patch)
tree8bde2b71292923cbc62b07c5ec1f7b3093ab25ff /Documentation/git-merge.txt
parentMerge branch 'maint' of git://github.com/git-l10n/git-po into maint (diff)
downloadtgif-ebba6c0ca617352ceef5caa636ab243f0ef14cc3.tar.xz
pack-heuristics.txt: mark up the file header properly
AsciiDoc wants these header-lines left-aligned. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions