aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorAlexey Borzenkov <snaury@gmail.com>2008-12-08 21:29:09 +0300
committerJunio C Hamano <gitster@pobox.com>2008-12-08 17:11:37 -0800
commit9c0c1b1f28e27bf4ac8a7b13f0b0ed3eaebc8cff (patch)
tree410ae4ea8a99eee773f5addf88b3111fb212e1f1 /Documentation/git-merge-file.txt
parent4586864afee675eb1c617666f806664aef04a02a (diff)
downloadgit-9c0c1b1f28e27bf4ac8a7b13f0b0ed3eaebc8cff.tar.gz
git-9c0c1b1f28e27bf4ac8a7b13f0b0ed3eaebc8cff.tar.xz
Define linkgit macro in [macros] section
Starting with asciidoc 8.3.0 linkgit macro is no longer recognized by asciidoc and user guide suggests (http://www.methods.co.nz/asciidoc/userguide.html#_macro_definitions) that macros are supposed to be defined in [macros] section. I'm not sure whether undefined linkgit macro was working by pure chance or it is a regression in asciidoc 8.3.0, but this patch adds proper definition for the linkgit macro, allowing it to work on 8.3.0. Signed-off-by: Alexey Borzenkov <snaury@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions