##// END OF EJS Templates
Clean up some merge logic...
Clean up some merge logic - rename mode to branch_merge - use explicit update mode - use negative mtime for updates that set mtime - expand some cryptic variable names - elaborate merge dirstate comments - remove redundant manifest lookup for non-merge case - remove impossible merge case - fix up test cases

File last commit:

r936:b62d1e73 default
r993:6f274afc default
Show More
test-remove
13 lines | 139 B | text/plain | TextLexer
#!/bin/sh
hg init a
cd a
echo a > foo
hg add foo
hg commit -m 1 -d "0 0"
rm foo
hg remove foo
hg commit -m 2 -d "0 0"
cd ..
hg clone a b