log mercurial/filemerge.py @ 6076:0ee885fea464

age author description
Wed, 06 Feb 2008 20:44:25 -0600 Steve Borho filemerge: more backwards compatible behavior for ui.merge