Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3113:f96c8e219865
age | author | description |
---|---|---|
Sun, 17 Sep 2006 18:28:50 -0500 | Matt Mackall | merge: remove no longer possible clause |
Sun, 17 Sep 2006 17:39:19 -0500 | Matt Mackall | merge: move apply and dirstate code into separate functions |
Sun, 17 Sep 2006 17:13:02 -0500 | Matt Mackall | merge: remove linear variable |
Sun, 17 Sep 2006 17:07:44 -0500 | Matt Mackall | merge: simplify hook code |
Sun, 17 Sep 2006 16:50:17 -0500 | Matt Mackall | merge: linear_path -> linear |
Sun, 17 Sep 2006 16:47:33 -0500 | Matt Mackall | merge: pull manifest checks and updates into separate functions |