.colordiffrc
author Oleksandr Gavenko <gavenkoa@gmail.com>
Tue, 25 Aug 2020 10:15:42 +0300
changeset 944 abefcbeca9a5
parent 886 74f10c613c59
permissions -rw-r--r--
New git on "git pull" asked to config one of: git config pull.rebase false # merge (the default strategy) git config pull.rebase true # rebase git config pull.ff only # fast-forward only
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
886
74f10c613c59 Added colors definition for cdiff because default schema uses blue for added
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     1
plain=normal
74f10c613c59 Added colors definition for cdiff because default schema uses blue for added
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     2
newtext=darkgreen
74f10c613c59 Added colors definition for cdiff because default schema uses blue for added
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     3
oldtext=darkred
74f10c613c59 Added colors definition for cdiff because default schema uses blue for added
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     4
diffstuff=magenta
74f10c613c59 Added colors definition for cdiff because default schema uses blue for added
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     5
cvsstuff=darkblue