log mercurial/filemerge.py @ 26957:d16d73173fdd

age author description
Wed, 11 Nov 2015 17:34:28 -0800 Siddharth Agarwal filemerge: rename _symlinkcheck to _mergecheck
Tue, 10 Nov 2015 16:25:59 -0800 Christian Delahousse filemerge: choose where .orig files are kept
Tue, 10 Nov 2015 17:13:16 -0800 Siddharth Agarwal filemerge: treat EOF at prompt as fail, not abort