diff tests/test-hgweb-json.t @ 25844:18541e9510c5

merge: make merge.preferancestor type and default consistent (and mark it)
author Matt Mackall <mpm@selenic.com>
date Thu, 25 Jun 2015 17:54:55 -0500
parents 4d2b9b304ad0
children 9de443515f1d
line wrap: on
line diff