comparison tests/test-unified-test.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 6a98f9408a50
comparison
equal deleted inserted replaced
25843:bf9ea348b487 25844:18541e9510c5