log

age author description
Thu, 25 Jun 2015 17:54:55 -0500 Matt Mackall merge: make merge.preferancestor type and default consistent
Thu, 25 Jun 2015 17:53:16 -0500 Matt Mackall merge: mark ancient debugging option