Mercurial > hg
comparison Makefile @ 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 | e6310cdcc4d0 |
children | ef5553fab197 |
comparison
equal
deleted
inserted
replaced
28577:7efff6ce9826 | 28578:66d085e55ecd |
---|