log mercurial/filemerge.py @ 28578:66d085e55ecd

age author description
Thu, 17 Mar 2016 00:36:01 +0000 timeless filemerge: indicate that local/other are p1/p2