tests/test-issue1089.out
author Patrick Mezard <pmezard@gmail.com>
Thu, 21 May 2009 22:43:38 +0200
changeset 8539 9a4fe59b1eca
parent 6980 2268edff1bec
permissions -rw-r--r--
test-merge-tools: windows fixes - /bin/cat does not exist, expect 'cat' - non-interactive mode is not correctly detected in pysh, force it

adding a/b
removing a/b
adding a/b
removing a/b