##// END OF EJS Templates
extdiff: merge node and working dir snapshot modes
extdiff: merge node and working dir snapshot modes

File last commit:

r6336:4b0c9c67 default
r8064:5c7bc1ae default
Show More
test-issue842.out
10 lines | 362 B | text/plain | TextLexer
adding a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% should issue warning
adding a
created new head
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% should not issue warning
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch testing
% should not issue warning