log mercurial/merge.py @ 6884:11229144aa01

age author description
Tue, 12 Aug 2008 17:47:08 +0200 Dirkjan Ochtman merge with crew-stable
Sun, 10 Aug 2008 21:55:06 -0500 Matt Mackall util: set_flags shouldn't know about repo flag formats
Tue, 01 Jul 2008 17:59:31 +0100 Paul Moore Sort removes first when applying updates (fixes issues 750 and 912)
Fri, 27 Jun 2008 18:28:45 -0500 Matt Mackall util: add sort helper
Thu, 26 Jun 2008 14:35:46 -0500 Matt Mackall use repo[changeid] to get a changectx
Thu, 26 Jun 2008 13:58:24 -0500 Matt Mackall rename checkfolding to checkcase
Thu, 26 Jun 2008 13:46:29 -0500 Matt Mackall use repo.changectx(None) to get a workingctx
Sat, 12 Apr 2008 20:51:26 +0200 Patrick Mezard merge: replace readline() call, missing from posixfile_nt
Fri, 11 Apr 2008 12:52:56 -0500 Matt Mackall resolve: new command
Fri, 11 Apr 2008 12:04:26 +0200 Dirkjan Ochtman python-2.6: use sha wrapper from util for new merge code
Thu, 10 Apr 2008 15:02:24 -0500 Matt Mackall merge: introduce mergestate
Sat, 29 Mar 2008 12:39:47 -0500 Matt Mackall copies: skip directory rename checks when not merging
Mon, 24 Mar 2008 20:28:13 +0100 Thomas Arendsen Hein Fix missing space in one of the new update messages.
Mon, 24 Mar 2008 10:01:05 -0500 Matt Mackall update: better logic and messages for updates
Sat, 22 Mar 2008 13:30:08 -0500 Matt Mackall update: no -C needed to switch branches without outstanding changes