comparison tests/test-merge-local.t @ 15832:b03388ffeb31

phase: fix up help string
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Jan 2012 16:36:33 -0600
parents 2371f4aea665
children ef1eb6df7071
comparison
equal deleted inserted replaced
15831:0ecaf1e72609 15832:b03388ffeb31