Mercurial > public > mercurial-scm > hg-stable
log mercurial/merge.py @ 9037:a232b90ffb51
age | author | description |
---|---|---|
Sun, 05 Jul 2009 11:01:01 +0200 | Alejandro Santos | compat: can't compare two values of unequal datatypes |
Mon, 15 Jun 2009 02:45:38 -0500 | Matt Mackall | subrepo: add update/merge logic |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: refactor manifestmerge init to better report effective ancestor |