Mercurial > hg
diff hgeditor @ 18257:a35d0128545e
merge: never do premerge on symlinks
Simplemerge is not symlink aware and will never do the right thing on symlinks.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 08 Jan 2013 04:15:46 +0100 |
parents | 2b440bb8a66b |
children | 1aee2ab0f902 |