Mercurial > hg
annotate tests/test-resolve.out @ 8551:7089d9727867
inotify: modular architecture for inotify clients
Put the socket init, query generation and response analysis in
a more generic client class.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Tue, 07 Apr 2009 18:39:34 +0900 |
parents | 9fe7e6acf525 |
children | b2310903c462 |
rev | line source |
---|---|
7734 | 1 adding file |
2 % create a second head | |
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 created new head | |
5 % failing merge | |
6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
7821
9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents:
7734
diff
changeset
|
7 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
7734 | 8 % resolve -l, should be empty |