summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2018-04-26 07:50:57 +0000
committerJunio C Hamano <gitster@pobox.com>2018-04-27 09:18:55 +0900
commit20460635a864c2d9256339864a724a0f2e9a5ea7 (patch)
treeff79a98e1d44acb96420afc85c043b789c2e8676 /git-merge-octopus.sh
parent00acdbc6fd5aa1635cf0a6dfa8a4c44e9b75e09e (diff)
downloadgit-20460635a864c2d9256339864a724a0f2e9a5ea7.tar.gz
.gitattributes: use the "perl" differ for Perl
As noted in gitattributes(5) this gives better patch context for these types of files. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions