Mercurial > hg
view tests/test-merge5.out @ 4749:778bab992732
Convert default mercurial.ini file to Windows line endings
author | Lee Cantey <lcantey@gmail.com> |
---|---|
date | Fri, 29 Jun 2007 13:06:49 -0700 |
parents | fffc8a733bf9 |
children | 4b0c9c674707 |
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