comparison tests/test-issue660.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 8b190adb7ee3
children 2fc86d92c4a9
comparison
equal deleted inserted replaced
25843:bf9ea348b487 25844:18541e9510c5