diff tests/test-merge-remove.t @ 13740:dcb51f156fa6

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 23 Mar 2011 12:38:36 -0500
parents 0a63e91c519d
children e4d7cbc94219
line wrap: on
line diff