Mercurial > hg
comparison tests/test-graft.t @ 39187:2f89a7defe62
test-graft: add a missing output line for Windows
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 18 Aug 2018 12:35:47 -0400 |
| parents | 46da52f4b820 |
| children | 89630d0b3e23 |
comparison
equal
deleted
inserted
replaced
| 39186:e8deaa77c1b6 | 39187:2f89a7defe62 |
|---|---|
| 708 unmatched files new in both: | 708 unmatched files new in both: |
| 709 b | 709 b |
| 710 resolving manifests | 710 resolving manifests |
| 711 branchmerge: True, force: True, partial: False | 711 branchmerge: True, force: True, partial: False |
| 712 ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87 | 712 ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87 |
| 713 starting 4 threads for background file closing (?) | |
| 713 committing files: | 714 committing files: |
| 714 b | 715 b |
| 715 warning: can't find ancestor for 'b' copied from 'a'! | 716 warning: can't find ancestor for 'b' copied from 'a'! |
| 716 reusing manifest form p1 (listed files actually unchanged) | 717 reusing manifest form p1 (listed files actually unchanged) |
| 717 committing changelog | 718 committing changelog |