Mercurial > hg
log tests/test-merge-remove.out @ 6543:a6e2e60b34d0
age | author | description |
---|---|---|
Fri, 21 Mar 2008 11:06:02 +0100 | Dirkjan Ochtman | warn about new heads on commit (issue842) |
Tue, 18 Mar 2008 04:07:39 -0300 | Alexis S. L. Carvalho | revert: update state of files in the "checkout" list |
Tue, 18 Mar 2008 04:07:39 -0300 | Alexis S. L. Carvalho | normallookup: during merges, restore the state saved by remove |
Tue, 18 Mar 2008 04:07:39 -0300 | Alexis S. L. Carvalho | dirstate.remove: during merges, remember the previous file state |