Mercurial > hg
comparison tests/test-hgweb-non-interactive.t @ 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 | f2719b387380 |
children | ae33fff17c1e |
comparison
equal
deleted
inserted
replaced
18256:d084df89d948 | 18257:a35d0128545e |
---|