log mercurial/merge.py @ 3113:f96c8e219865

age author description
Sun, 17 Sep 2006 18:28:50 -0500 Matt Mackall merge: remove no longer possible clause