log mercurial/filemerge.py @ 26574:f82cb7dffb49

age author description
Thu, 08 Oct 2015 14:18:43 -0700 Siddharth Agarwal filemerge._xmerge: drop no longer necessary 'if r:' check