Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3155:c82ea81d6850
age | author | description |
---|---|---|
Mon, 25 Sep 2006 16:45:31 -0500 | Matt Mackall | Add core copy detection algorithm |
Sun, 17 Sep 2006 21:27:30 -0500 | Matt Mackall | merge: simplify actions with helper function |
Sun, 17 Sep 2006 21:11:26 -0500 | Matt Mackall | merge: simplify local created logic |
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 |