summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Martin Ågren <martin.agren@gmail.com>2017-08-02 21:40:49 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-03 11:08:10 -0700
commitec14d4ecb5507550e31ba0a0016eb83fcde48f3f (patch)
treee28711dbd18c6b97dc8423b7cec818f52a3439d2 /mergetools
parentMerge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po (diff)
downloadtgif-ec14d4ecb5507550e31ba0a0016eb83fcde48f3f.tar.xz
builtin.h: take over documentation from api-builtin.txt
Delete Documentation/technical/api-builtin.txt and move its content into builtin.h. Format it as a comment. Remove a '+' which was needed when the information was formatted for AsciiDoc. Similarly, change "::" to ":". Document SUPPORT_SUPER_PREFIX, thereby bringing the documentation up to date with the available flags. While at it, correct '3 more things to do' to '4 more things to do'. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions