log mercurial/merge.py @ 3120:b1de36a4b4df

age author description
Sun, 17 Sep 2006 20:43:06 -0500 Matt Mackall merge: simplify prompt code