Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-mq.out @ 4887:bbdcacf7cef8
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 | cba10652a901 |
children | 27414950abf5 |
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