diff tests/test-merge-revert2.t @ 21764:cd3c79392056

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 18 Jun 2014 20:59:36 -0500
parents 9c35f3a8cac4
children ef1eb6df7071
line wrap: on
line diff