Thu, 25 Jun 2015 17:54:55 -0500 merge: make merge.preferancestor type and default consistent
Matt Mackall <mpm@selenic.com> [Thu, 25 Jun 2015 17:54:55 -0500] rev 25844
merge: make merge.preferancestor type and default consistent (and mark it)
Thu, 25 Jun 2015 17:53:16 -0500 merge: mark ancient debugging option
Matt Mackall <mpm@selenic.com> [Thu, 25 Jun 2015 17:53:16 -0500] rev 25843
merge: mark ancient debugging option
(0) -10000 -3000 -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 +10000 tip