From: Jan Kratochvil Date: Sat, 18 Sep 2021 12:03:51 +0000 (+0200) Subject: .gitconfig: +merge.renamelimit=10000 X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=6a15e35efbfd33c90ac0caa119d1d2075c37977b;hp=33601ea1211b53913056abce468e9e7e3c58b39b .gitconfig: +merge.renamelimit=10000 - for LLVM --- diff --git a/.gitconfig b/.gitconfig index 191f05f..e37f907 100644 --- a/.gitconfig +++ b/.gitconfig @@ -7,6 +7,7 @@ defaultBranch = master [merge] conflictstyle = diff3 + renamelimit = 10000 [color] ui = never [pull]