Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3120:b1de36a4b4df
age | author | description |
---|---|---|
Sun, 17 Sep 2006 20:43:06 -0500 | Matt Mackall | merge: simplify prompt code |
Sun, 17 Sep 2006 20:38:02 -0500 | Matt Mackall | merge: simplify exec flag handling |
Sun, 17 Sep 2006 20:18:27 -0500 | Matt Mackall | merge: simplify tests for local changed/remote deleted |
Sun, 17 Sep 2006 20:10:54 -0500 | Matt Mackall | merge: more simplification of m2 manifest scanning |
Sun, 17 Sep 2006 20:00:14 -0500 | Matt Mackall | merge: reorder tests on m2 items in manifestmerge |
Sun, 17 Sep 2006 19:54:01 -0500 | Matt Mackall | merge: eliminate redundant security check |