diff tests/test-issue660.t @ 15501:2371f4aea665

merge: give a special message for internal:merge failure (issue3105)
author Matt Mackall <mpm@selenic.com>
date Wed, 16 Nov 2011 18:04:19 -0600
parents 9910f60a37ee
children 8b190adb7ee3
line wrap: on
line diff