Mercurial > hg
diff hgext/convert/p4.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 | 630f5f04bc74 |
children | a0939666b836 |
author | timeless <timeless@mozdev.org> |
---|---|
date | Thu, 17 Mar 2016 00:36:01 +0000 |
parents | 630f5f04bc74 |
children | a0939666b836 |