view tests/test-merge5.out @ 1713:03ee100b8c21

hooks: distinguish between locally committed and incoming changes.

"commit" hook is now for locally committed changes only.
"incoming" is for changes pulled, pushed, or unbundled into local repo.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)