##// 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:

r896:01215ad0 merge default
r993:6f274afc default
Show More
test-help
15 lines | 143 B | text/plain | TextLexer
#!/bin/sh
hg
hg -q
hg help
hg -q help
hg add -h
hg add --skjdfks
hg help diff
hg help status
hg -q help status
hg help foo
hg skjdfks
exit 0