comparison tests/test-merge-local.t @ 21757:c00822e0b8ea

merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 14 Jun 2014 11:56:20 -0500
parents 2371f4aea665
children ef1eb6df7071
comparison
equal deleted inserted replaced
21756:f5fd1580a649 21757:c00822e0b8ea