Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 4088:18dcc22666a0
Make extdiff work at root directory
author | Andrei Vermel <avermel@mail.ru> |
---|---|
date | Thu, 15 Feb 2007 12:51:43 +0300 |
parents | fffc8a733bf9 |
children |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes