Commit Diff

Commit:
606719cd7bdc625a582f93ddbc966675568f0026
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
document all reasons why 'got merge' might be interrupted
Actions:
Patch | Tree
commit - c1b057235b48f7b8bc01bd3c31348517856bc68b
commit + 606719cd7bdc625a582f93ddbc966675568f0026
blob - 87a57e122c712ef21868c139097562f10ce37ee6
blob + d988c12aff8b0cdf7dd6438196b3b325427b11f6
--- got/got.1
+++ got/got.1
@@ -2180,7 +2180,8 @@ using the following status codes:
 .Pp
 If merge conflicts occur, the merge operation is interrupted and conflicts
 must be resolved before the merge operation can continue.
-If any files with destined changes are found to be missing,
+If any files with destined changes are found to be missing or unversioned,
+or if files could not be deleted due to differences in deleted content,
 the merge operation will be interrupted to prevent potentially incomplete
 changes from being committed to the repository without user intervention.
 The work tree may be modified as desired and the merge can be continued