diff tests/test-rebase-conflicts @ 9620:a7ef354da662

summary: add --remote
author Matt Mackall <mpm@selenic.com>
date Tue, 20 Oct 2009 11:59:38 -0500
parents 8766fee6f225
children b345b1cc124f
line wrap: on
line diff