Commit 606719cd7bdc625a582f93ddbc966675568f0026

Stefan Sperling 2021-09-28T21:29:30

document all reasons why 'got merge' might be interrupted

1
2
3
4
5
6
7
8
9
10
11
12
13
14
diff --git a/got/got.1 b/got/got.1
index 87a57e1..d988c12 100644
--- a/got/got.1
+++ b/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