summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <j6t@kdbg.org>2014-03-21 22:07:14 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-21 14:48:07 -0700
commitabf8f9860248d8c213600974742f18dadaa8fbb5 (patch)
tree8a1138dc96032616f84dc6152355132f4f201829 /Documentation/merge-config.txt
parentuserdiff: support C++ ->* and .* operators in the word regexp (diff)
downloadtgif-abf8f9860248d8c213600974742f18dadaa8fbb5.tar.xz
userdiff: support unsigned and long long suffixes of integer constants
Do not split constants such as 123U, 456ll, 789UL at the first U or second L. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions