diff contrib/simplemerge @ 19179:12459bfa4b59

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 09 May 2013 18:34:04 -0500
parents cba222f01056
children 9de689d20230
line wrap: on
line diff