merge.c
72.4 KB
-
Merge pull request #2967 from jacquesg/merge-whitespace · 89ba9f1aAllow merges of files (and trees) with whitespace problems/fixes
Edward Thomson committed
Allow merges of files (and trees) with whitespace problems/fixes