diff tests/test-merge8.t @ 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 f2719b387380
children eb586ed5d8ce
line wrap: on
line diff