annotate tests/test-merge3.out @ 4398:3b7e284b8f28

merge: expand and simplify the invalid handling for directory moves
author Matt Mackall <>
date Thu, 03 May 2007 17:24:43 -0500
parents 91c56c427171
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <>
parents: 749
diff changeset
1 removing b
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <>
parents: 775
diff changeset
2 nothing changed