Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3103:22336ad45cf2
age | author | description |
---|---|---|
Sun, 17 Sep 2006 15:54:51 -0500 | Matt Mackall | merge: add forget to action list |
Sun, 17 Sep 2006 15:24:00 -0500 | Matt Mackall | merge: add codes to action list, eliminate None elements |
Sun, 17 Sep 2006 15:10:56 -0500 | Matt Mackall | merge: convert actions to list |