Mercurial > hg
diff tests/test-up-local-change.out @ 10944:6f1894d6a6b0 stable
filemerge: use working dir parent as ancestor for backward wdir merge
I checked the tests, they were bogus in the first place
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Mon, 19 Apr 2010 20:41:53 +0200 |
| parents | ba5e508b5e92 |
| children | db426935fa94 |
line wrap: on
line diff
--- a/tests/test-up-local-change.out Mon Apr 19 20:30:31 2010 +0200 +++ b/tests/test-up-local-change.out Mon Apr 19 20:41:53 2010 +0200 @@ -48,8 +48,7 @@ update: a 2/2 files (100.00%) picked tool 'true' for a (binary False symlink False) merging a -my a@802f095af299+ other a@33aaa84a386b ancestor a@33aaa84a386b - premerge successful +my a@802f095af299+ other a@33aaa84a386b ancestor a@802f095af299 0 files updated, 1 files merged, 1 files removed, 0 files unresolved changeset: 0:33aaa84a386b user: test