commit 8cf2970b6c6851169342b56a57bfe72560170f1a
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas@xteddy.org>
date: Tue Sep 28 23:20:09 2021 UTC

document all reasons why 'got merge' might be interrupted

commit - ba1629912dc172d6dfe5d0c09cb1e60c15c01899
commit + 8cf2970b6c6851169342b56a57bfe72560170f1a
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