diff mercurial/subrepo.py @ 28578:66d085e55ecd

filemerge: indicate that local/other are p1/p2
author timeless <timeless@mozdev.org>
date Thu, 17 Mar 2016 00:36:01 +0000
parents d3f1b7ee5e70
children a88959ae5938
line wrap: on
line diff