view tests/test-resolve.out @ 8545:3682a19bb637

merge: give hint as to how to discover uncommitted changes

Many users will try 'hg diff' here, and it will not show them missing files.

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