summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2018-08-15 07:33:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-15 10:40:46 -0700
commit1ce2b452c665335b44b4c38456821bac9bb007f3 (patch)
tree0a3fe08f13e08fa7f295100a1c0076d8ad0bc95d /Documentation/git-merge-tree.txt
parentt/chainlint.sed: drop extra spaces from regex character class (diff)
downloadtgif-1ce2b452c665335b44b4c38456821bac9bb007f3.tar.xz
chainlint: fix for core.autocrlf=true
The `chainlint` target compares actual output to expected output, where the actual output is generated from files that are specifically checked out with LF-only line endings. So the expected output needs to be checked out with LF-only line endings, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions