Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-merge7.out @ 3729:581d20773326
age | author | description |
---|---|---|
Tue, 10 Oct 2006 02:15:20 -0500 | Matt Mackall | merge: various tidying |
Tue, 10 Oct 2006 01:16:06 -0500 | Matt Mackall | merge: shortcircuit filemerge for identical files |
Mon, 09 Oct 2006 21:27:04 -0500 | Matt Mackall | filemerge: use contexts rather than my and other |
Mon, 02 Oct 2006 12:04:48 -0500 | Matt Mackall | merge: extend file merge function for renames |
Sun, 17 Sep 2006 21:27:30 -0500 | Matt Mackall | merge: simplify actions with helper function |
Sun, 17 Sep 2006 17:13:02 -0500 | Matt Mackall | merge: remove linear variable |
Tue, 22 Aug 2006 19:32:16 -0500 | Matt Mackall | merge: use context code to retrieve manifests |