Mercurial > hg
view tests/test-merge-revert.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.
author | Daniel Santa Cruz <byteshack@gmail.com> |
---|---|
date | Fri, 10 Feb 2006 16:45:56 -0500 |
parents | 5a034646e472 |
children | 7544700fd931 |
line wrap: on
line source
1:3aa14bbc23d9 0:8633637036c1 3aa14bbc23d9 tip 8633637036c1 8633637036c1+ 8633637036c1 3aa14bbc23d9 tip merging file1 3aa14bbc23d9 tip 3aa14bbc23d9 tip 3aa14bbc23d9 tip 3aa14bbc23d9 tip