Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
10942:6f26ce7ae175 | 10944:6f1894d6a6b0 |
---|---|
46 update: b 1/2 files (50.00%) | 46 update: b 1/2 files (50.00%) |
47 removing b | 47 removing b |
48 update: a 2/2 files (100.00%) | 48 update: a 2/2 files (100.00%) |
49 picked tool 'true' for a (binary False symlink False) | 49 picked tool 'true' for a (binary False symlink False) |
50 merging a | 50 merging a |
51 my a@802f095af299+ other a@33aaa84a386b ancestor a@33aaa84a386b | 51 my a@802f095af299+ other a@33aaa84a386b ancestor a@802f095af299 |
52 premerge successful | |
53 0 files updated, 1 files merged, 1 files removed, 0 files unresolved | 52 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
54 changeset: 0:33aaa84a386b | 53 changeset: 0:33aaa84a386b |
55 user: test | 54 user: test |
56 date: Mon Jan 12 13:46:40 1970 +0000 | 55 date: Mon Jan 12 13:46:40 1970 +0000 |
57 summary: 1 | 56 summary: 1 |