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

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