Mercurial > hg > gitserve
view tests/test-merge5.out @ 3373:7f486971d263
Add git-1.4 binary patch support
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 12 Oct 2006 09:17:16 -0700 |
parents | 49988d9f0758 |
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