On Tue, Jan 08, 2013 at 04:23:52AM +0100, Mads Kiilerich wrote: > merge: never do premerge on symlinks > > Simplemerge is not symlink ware and will never do the right thing on symlinks. These two patches look good ("ware" -> "aware"), thanks.