comparison tests/test-merge-prompt.t @ 12910:d0b08dcbcf0b stable

Added tag 1.7 for changeset 333421b9e0f9
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Nov 2010 17:40:14 -0500
parents 22f3353bcc36
children 117f9190c1ba
comparison
equal deleted inserted replaced
12909:333421b9e0f9 12910:d0b08dcbcf0b