diff tests/test-merge-remove.t @ 16451:9c431cfdca12

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 16 Apr 2012 16:50:25 -0500
parents 0a63e91c519d
children e4d7cbc94219
line wrap: on
line diff