Mercurial > hg > mercurial-crew-with-dirclash

log mercurial/merge.py @ 3570:c141d07198b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -15 tip
age author description
Tue, 17 Oct 2006 22:59:01 -0500 Matt Mackall merge: fix branch setting
Tue, 17 Oct 2006 22:34:43 -0500 Matt Mackall imported patch foo
Sun, 15 Oct 2006 16:18:09 -0500 Matt Mackall merge: if filemerge skips merge, report as updated
Fri, 13 Oct 2006 17:58:04 -0500 Matt Mackall merge: update dirstate correctly for non-branchmerge updates
Thu, 12 Oct 2006 14:49:19 -0500 Matt Mackall merge: turn followcopies on by default
Tue, 10 Oct 2006 03:39:44 -0500 Matt Mackall merge: pull user messages out to hg.py
Tue, 10 Oct 2006 02:31:02 -0500 Matt Mackall merge: update some docstrings
Tue, 10 Oct 2006 02:15:20 -0500 Matt Mackall merge: various tidying
Tue, 10 Oct 2006 01:43:58 -0500 Matt Mackall merge: use contexts in checkunknown and forgetremoved
Tue, 10 Oct 2006 01:16:06 -0500 Matt Mackall merge: shortcircuit filemerge for identical files
Tue, 10 Oct 2006 00:54:00 -0500 Matt Mackall merge: pull file copy/move out of filemerge
Tue, 10 Oct 2006 00:41:55 -0500 Matt Mackall merge: unify merge and copy actions
Tue, 10 Oct 2006 00:32:30 -0500 Matt Mackall merge: swap file and mode args for act()
Tue, 10 Oct 2006 00:22:03 -0500 Matt Mackall merge: finish removing nodes from action list
Mon, 09 Oct 2006 23:23:25 -0500 Matt Mackall merge: eliminate nodes from action list
less more | (0) -15 tip