Mercurial > hg
log tests/test-up-local-change.out @ 8811:8b35b08724eb
| age | author | description |
|---|---|---|
| Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: refactor manifestmerge init to better report effective ancestor |
| Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: allow merging going backwards |
| Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: pretend ancestor is local to simplify backwards and overwrite |
| Fri, 22 May 2009 11:42:21 -0500 | Steve Borho | merge: give hint as to how to discover uncommitted changes |
| Thu, 10 Apr 2008 15:02:24 -0500 | Matt Mackall | merge: introduce mergestate |
| Mon, 24 Mar 2008 10:01:05 -0500 | Matt Mackall | update: better logic and messages for updates |
| Fri, 21 Mar 2008 14:52:24 +0100 | Adrian Buehlmann | clone: print "updating working directory" status message |