diff tests/test-merge-prompt.t @ 18739:5b7175377bab stable 2.5.2

setparents: drop copies from dropped p2 (issue3843)
author Matt Mackall <mpm@selenic.com>
date Thu, 28 Feb 2013 21:29:31 -0600
parents 117f9190c1ba
children c8ba98bf0e71
line wrap: on
line diff