comparison tests/test-merge-remove.t @ 17059:fba17a64fa49

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 29 Jun 2012 00:40:52 -0500
parents 0a63e91c519d
children e4d7cbc94219
comparison
equal deleted inserted replaced
17058:d5422faf648c 17059:fba17a64fa49