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

r814:0902ffec merge default
r993:6f274afc default
Show More
test-hook
9 lines | 197 B | text/plain | TextLexer
#!/bin/sh
hg init
echo "[hooks]" > .hg/hgrc
echo 'precommit = echo precommit hook' >> .hg/hgrc
echo 'commit = echo commit hook: $NODE' >> .hg/hgrc
echo a > a
hg add a
hg commit -m "test" -d "0 0"