comparison mercurial/changelog.py @ 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 c0c943ef4e55
children 06185554e7e3
comparison
equal deleted inserted replaced
18256:d084df89d948 18257:a35d0128545e