##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r9896:2c2f7593 stable
r9898:b5170b8b merge default
Show More
test-inotify.out
50 lines | 614 B | text/plain | TextLexer
adding a
adding b
adding c
adding d
adding dir/bar/foo
adding dir/x
adding dir/y
adding e
updating to branch default
8 files updated, 0 files merged, 0 files removed, 0 files unresolved
M a
% inserve
? hg.pid
% clean
C a
C b
C c
C d
C dir/bar/foo
C dir/x
C dir/y
C e
% all
? hg.pid
C a
C b
C c
C d
C dir/bar/foo
C dir/x
C dir/y
C e
% path patterns
M dir/x
? hg.pid
M dir/x
M x
% issue 1375
adding h/h
adding hg.pid
removing h/h
A h
R h/h
M a
merging a
1 files updated, 1 files merged, 2 files removed, 0 files unresolved
M a
3 files updated, 1 files merged, 0 files removed, 0 files unresolved
M a
adding 1844/foo