Use merge-recursive in git-checkout -m (branch switching)
[git] / contrib / colordiff /
drwxr-xr-x   ..
-rw-r--r-- 124 README
-rwxr-xr-x 6250 colordiff.perl