##// END OF EJS Templates
Fix hgwebdir after 9858477ed74cce9dc8f4069f9453a1bda0e13ba1 broke it.
Fix hgwebdir after 9858477ed74cce9dc8f4069f9453a1bda0e13ba1 broke it.

File last commit:

r4416:bb1800a7 default
r5083:f94dbc6c default
Show More
test-merge8.out
9 lines | 318 B | text/plain | TextLexer
Thomas Arendsen Hein
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)...
r3389 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
Matt Mackall
merge: fix spurious merges for copies in linear updates...
r4416 1 files updated, 0 files merged, 1 files removed, 0 files unresolved