summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2015-04-20 14:09:06 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-20 11:05:50 -0700
commitd349e0ee60e1bad1cf49245e402ca086ddb5ff80 (patch)
treeb6efb7dfe74c7177beeb6623de202b3609e7f5ab /Documentation/merge-config.txt
parentGit 2.3.5 (diff)
downloadtgif-d349e0ee60e1bad1cf49245e402ca086ddb5ff80.tar.xz
Documentation: change -L:<regex> to -L:<funcname>
The old wording was somehow implying that <start> and <end> were not regular expressions. Also, the common case is to use a plain function name here so <funcname> makes sense (the fact that it is a regular expression is documented in line-range-format.txt). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions