$ hg backout --merge 7:7 reverting foo.txt created new head changeset 9:664c3e4cbb2b backs out changeset 7:3f5bacea93aa merging with changeset 9:664c3e4cbb2b merging foo.txt warning: conflicts during merge. merging foo.txt incomplete! (edit conflicts, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon@see com.aragost.javahg.merge.ConflictResolvingContext#processStream(com.aragost.javahg.internals.HgInputStream,boolean)
@param in @param whenUnknowReturn @throws IOException
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|