diff tests/test-merge-default.t @ 20403:47f25736d006

push: backout 2bc520bd0ce0 due to test failures
author Matt Mackall <mpm@selenic.com>
date Sun, 09 Feb 2014 17:31:26 -0600
parents fc8c7a5ccc4a
children 94f77624dbb5
line wrap: on
line diff