comparison tests/test-merge-default.t @ 14481:b2ee161328e0

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 31 May 2011 15:28:23 -0500
parents 4134686b83e1
children 41885892796e 6c8573dd1b6b
comparison
equal deleted inserted replaced
14480:a21246c7e7d7 14481:b2ee161328e0