Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge1 @ 1623:eef8ff46567a
Added test for the currently broken addremove with the expected output.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 17 Jan 2006 15:03:47 +0100 |
parents | db10b7114de0 |
children | 7544700fd931 |