comparison tests/test-merge-prompt.t @ 20965:774ff56cbe34

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Apr 2014 12:41:39 -0400
parents c8ba98bf0e71
children 9ab18a912c44
comparison
equal deleted inserted replaced
20964:a939eeb94833 20965:774ff56cbe34