log mercurial/merge.py @ 3104:e6818b0b8154

age author description
Sun, 17 Sep 2006 15:59:59 -0500 Matt Mackall merge: move set_exec to actions