comparison tests/test-merge-commit.t @ 14875:3e9a5c3e24d8

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 13 Jul 2011 19:27:56 -0500
parents ec5886db9dc6
children efdcce3fd2d5
comparison
equal deleted inserted replaced
14874:d7b424a03627 14875:3e9a5c3e24d8