log mercurial/filemerge.py @ 26614:ef1eb6df7071

age author description
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge