comparison tests/test-merge-prompt.t @ 13334:2b2155623ee2 stable 1.7.5

merge with crew
author Matt Mackall <mpm@selenic.com>
date Tue, 01 Feb 2011 17:29:38 -0600
parents 22f3353bcc36
children 117f9190c1ba
comparison
equal deleted inserted replaced
13332:927e3940bfc3 13334:2b2155623ee2