log mercurial/filemerge.py @ 18256:d084df89d948

age author description
Tue, 08 Jan 2013 04:15:41 +0100 Mads Kiilerich merge: make internal merge fail cleanly on symlinks