Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 2946:a7a9ba7a9f48
add test for issue 322.
no .out file because issue is still live.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 18 Aug 2006 14:49:12 -0700 |
parents | 49988d9f0758 |
children | 41989e55fa37 |
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