diff tests/test-merge-commit.t @ 14049:92db9667d15a

subrepo: backout bcc6ed0f6c3b
author Matt Mackall <mpm@selenic.com>
date Sat, 30 Apr 2011 03:00:38 -0500
parents b00eda50ad2b
children ec5886db9dc6
line wrap: on
line diff