diff tests/test-revert-interactive.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 dcc56e10c23b
children 79139c7a88bd
line wrap: on
line diff