summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Richard Hubbell <richard_hubbe11@lavabit.com>2012-11-04 09:45:55 -0800
committerLibravatar Jeff King <peff@peff.net>2012-11-08 12:59:23 -0500
commit048b3991924a0666a2ab4f381caac8d62962de38 (patch)
tree32c4642e73eb0e6b0e04c8e04dd4922abaa4a686 /Documentation/git-mergetool.txt
parentGit 1.7.12.4 (diff)
downloadtgif-048b3991924a0666a2ab4f381caac8d62962de38.tar.xz
gitweb.perl: fix %highlight_ext mappings
When commit 592ea41 refactored the list of extensions for syntax highlighting, it failed to take into account perl's operator precedence within lists. As a result, we end up creating a dictionary of one-to-one elements when the intent was to map mutliple related types to one main type (e.g., bash, ksh, zsh, and sh should all map to sh since they share similar syntax, but we ended up just mapping "bash" to "bash" and so forth). This patch adds parentheses to make the mapping as the original change intended. It also reorganizes the list to keep mapped extensions together. Signed-off-by: Richard Hubbell <richard_hubbe11@lavabit.com> Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions