log mercurial/filemerge.py @ 30460:ce3a133f71b3

age author description
Sat, 19 Nov 2016 15:41:37 -0800 Kostia Balytskyi conflicts: make spacing consistent in conflict markers