diff tests/test-issue322.out @ 6363:bbfebf751ac8

test-imerge: test resolve subcommand
author Patrick Mezard <pmezard@gmail.com>
date Sun, 23 Mar 2008 20:37:04 +0100
parents e3dffbdc6522
children
line wrap: on
line diff