log mercurial/filemerge.py @ 28640:4fc640fd0026

age author description
Thu, 17 Mar 2016 00:36:01 +0000 timeless filemerge: use revset notation for p1/p2 of local/other descriptions