log mercurial/filemerge.py @ 10944:6f1894d6a6b0 stable

age author description
Mon, 19 Apr 2010 20:41:53 +0200 Benoit Boissinot filemerge: use working dir parent as ancestor for backward wdir merge stable
Tue, 23 Feb 2010 23:19:09 +0100 Patrick Mezard filemerge: use native path separators when merging (issue1399) stable