common.h
6.47 KB
-
Merge pull request #4489 from libgit2/ethomson/conflicts_crlf · 26f5d36dConflict markers should match EOL style in conflicting files
Edward Thomson committed
Conflict markers should match EOL style in conflicting files