log mercurial/filemerge.py @ 27123:4dc5951df1e4

age author description
Tue, 24 Nov 2015 10:57:01 -0800 Siddharth Agarwal filemerge: in ':fail' tool, write out other side if local side is deleted
Sat, 14 Nov 2015 00:00:46 -0800 Siddharth Agarwal filemerge: don't try to copy files known to be absent
Fri, 13 Nov 2015 23:57:43 -0800 Siddharth Agarwal filemerge: don't try using external tools on change/delete conflicts