log mercurial/filemerge.py @ 32736:173f1bdc322d

age author description
Fri, 19 May 2017 03:47:43 -0700 Stanislau Hlebik filemerge: store error messages in module variables
Sat, 13 May 2017 03:31:42 +0900 FUJIWARA Katsunori filemerge: add internal merge tool to dump files forcibly
Sat, 13 May 2017 03:28:36 +0900 FUJIWARA Katsunori filemerge: make warning message more i18n friendly