diff tests/test-rename-dir-merge.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 a6fe1b9cc68f
children 760c0d67ce5e
line wrap: on
line diff