log mercurial/merge.py @ 3162:84561ea8711e

age author description
Tue, 26 Sep 2006 16:04:07 -0500 Matt Mackall merge: move findcopies after workingmanifest
Tue, 26 Sep 2006 15:58:51 -0500 Matt Mackall findcopies: shortcut for empty working dir
Mon, 25 Sep 2006 20:31:05 -0500 Matt Mackall findcopies: use dirstate rename information
Mon, 25 Sep 2006 16:45:31 -0500 Matt Mackall Add core copy detection algorithm
Sun, 17 Sep 2006 21:27:30 -0500 Matt Mackall merge: simplify actions with helper function
Sun, 17 Sep 2006 21:11:26 -0500 Matt Mackall merge: simplify local created logic
Sun, 17 Sep 2006 20:43:06 -0500 Matt Mackall merge: simplify prompt code