log mercurial/merge.py @ 3111:40e777bda455

age author description
Sun, 17 Sep 2006 17:13:02 -0500 Matt Mackall merge: remove linear variable
Sun, 17 Sep 2006 17:07:44 -0500 Matt Mackall merge: simplify hook code
Sun, 17 Sep 2006 16:50:17 -0500 Matt Mackall merge: linear_path -> linear