diff tests/test-merge-prompt.t @ 21585:652e07debf10

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 27 May 2014 17:41:20 -0700
parents c8ba98bf0e71
children 9ab18a912c44
line wrap: on
line diff