tests/test-merge4.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Thu, 11 May 2006 10:14:48 -0700
changeset 2266 3f7692b0ff13
parent 2175 b2ae81a7df29
permissions -rw-r--r--
hooks: add preupdate and update hooks. preupdate run before working dir updated. can prevent update. update run after working dir updated.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)