Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-mq.out @ 4911:fc502517d68d
mq: autodetect an existing git patch during qrefresh (issue 491)
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon, 16 Jul 2007 16:50:47 -0700 |
| parents | 905397be7688 |
| children | 8535c1770dd3 06154aff2b1a |
line wrap: on
line diff
--- a/tests/test-mq.out +++ b/tests/test-mq.out @@ -325,6 +325,8 @@ diff --git a/foo b/baz rename from foo rename to baz 2 baz (foo) +diff --git a/bar b/bar +diff --git a/foo b/baz 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved