view 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
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