Mercurial > hg
diff contrib/wix/dist.wxs @ 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 | 95e042d77a5f |
children | a9c71d578a1c 5e1a91f693f0 |