.colordiffrc
author Oleksandr Gavenko <gavenkoa@gmail.com>
Sun, 21 Mar 2021 01:27:55 +0200
changeset 973 277ccd286936
parent 886 74f10c613c59
permissions -rw-r--r--
Enabled rerere. Keeps database of manually resolved conflicts.

plain=normal
newtext=darkgreen
oldtext=darkred
diffstuff=magenta
cvsstuff=darkblue