diff hgext/histedit.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 e2b9145e35d8
children cdbd9c0c0775
line wrap: on
line diff