Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
4886:2f09df302f30 | 4887:bbdcacf7cef8 |
---|---|
323 +bar | 323 +bar |
324 diff --git a/foo b/baz | 324 diff --git a/foo b/baz |
325 rename from foo | 325 rename from foo |
326 rename to baz | 326 rename to baz |
327 2 baz (foo) | 327 2 baz (foo) |
328 diff --git a/bar b/bar | |
329 diff --git a/foo b/baz | |
328 | 330 |
329 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | 331 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
330 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | 332 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
331 adding branch | 333 adding branch |
332 adding changesets | 334 adding changesets |