Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-force.t
changeset 27557 28b5c4fcf48d
parent 27163 27b89a0957ec
child 27599 ad5966de3c9a
equal deleted inserted replaced
27556:1df9b8b2abda 27557:28b5c4fcf48d 
   777   warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
 
   777   warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
 
   778   warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
 
   778   warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
 
   779   warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
 
   779   warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
 
   780   [1]
 
   780   [1]
 
   781   $ checkstatus > $TESTTMP/status2 2>&1
 
   781   $ checkstatus > $TESTTMP/status2 2>&1
 
   782   $ diff -U8 $TESTTMP/status1 $TESTTMP/status2
 
   782   $ cmp $TESTTMP/status1 $TESTTMP/status2 || diff -U8 $TESTTMP/status1 $TESTTMP/status2
mercurial