Mercurial > jhg
diff src/org/tmatesoft/hg/repo/HgMergeState.java @ 353:0f3687e79f5a
Treat content with target line endings as correct regardless eol.only-consistent setting
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Thu, 01 Dec 2011 03:05:28 +0100 | 
| parents | a0864b2892cd | 
| children | 2fadf8695f8a | 
