comparison tests/test-merge-local.t @ 21764:cd3c79392056

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 18 Jun 2014 20:59:36 -0500
parents 2371f4aea665
children ef1eb6df7071
comparison
equal deleted inserted replaced
21763:84cd5ee787ed 21764:cd3c79392056