Mercurial > hg-stable
log mercurial/merge.py @ 6805:482581431dcd
age | author | description |
---|---|---|
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 |