diff contrib/chg/hgclient.c @ 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 8e5312f8df30
children 222f482930c8
line wrap: on
line diff