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

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