log tests/test-merge-remove.out @ 10996:f6d41bfc189e

age author description
Wed, 25 Jun 2008 17:33:34 -0500 Matt Mackall lookup: optimize '.'
Tue, 03 Jun 2008 15:41:09 -0500 Matt Mackall copies: teach copies about dirstate.copies
Thu, 10 Apr 2008 15:02:24 -0500 Matt Mackall merge: introduce mergestate
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