Mercurial > hg
view tests/test-resolve.out @ 7953:8c6f823efcc9
Correct a bug on date formats with '>' or '<' accompanied by space characters.
author | Justin Peng <justin.peng.sw@gmail.com> |
---|---|
date | Wed, 01 Apr 2009 09:11:00 -0700 |
parents | 9fe7e6acf525 |
children | b2310903c462 |
line wrap: on
line source
adding file % create a second head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head % failing merge 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon % resolve -l, should be empty