log mercurial/merge.py @ 3309:488d3062d225

age author description
Mon, 09 Oct 2006 23:23:25 -0500 Matt Mackall merge: eliminate nodes from action list