commit df3d7c3ef8853d0fa9182dd3f3023a4d5e222ce0 from: Stefan Sperling via: Thomas Adam date: Fri Sep 24 22:01:09 2021 UTC stop using the term 'obstructed' ambiguously in the got.1 man page Specifically, obstructed files are versioned files which should be on disk but have been replaced on disk by a non-regular file (e.g. by a directory). The man page used the phrase "deletion was obstructed" which is unrelated to the above concept and can be expressed as "deletion was prevented" instead. commit - 88d249c247d1925b032b3d0b1ce8cac6aa7d1a6d commit + df3d7c3ef8853d0fa9182dd3f3023a4d5e222ce0 blob - ad59381b01b718149650684acc9d252cdfdf08dc blob + 06422c812cb6a86575f656e0a5293c72ed775769 --- got/got.1 +++ got/got.1 @@ -1611,7 +1611,7 @@ Show the status of each affected file, using the follo .It C Ta file was merged and conflicts occurred during merge .It ! Ta changes destined for a missing file were not merged .It D Ta file was deleted -.It d Ta file's deletion was obstructed by local modifications +.It d Ta file's deletion was prevented by local modifications .It A Ta new file was added .It \(a~ Ta changes destined for a non-regular file were not merged .It ? Ta changes destined for an unversioned file were not merged @@ -1655,7 +1655,7 @@ Show the status of each affected file, using the follo .It C Ta file was merged and conflicts occurred during merge .It ! Ta changes destined for a missing file were not merged .It D Ta file was deleted -.It d Ta file's deletion was obstructed by local modifications +.It d Ta file's deletion was prevented by local modifications .It A Ta new file was added .It \(a~ Ta changes destined for a non-regular file were not merged .It ? Ta changes destined for an unversioned file were not merged @@ -1742,7 +1742,7 @@ using the following status codes: .It C Ta file was merged and conflicts occurred during merge .It ! Ta changes destined for a missing file were not merged .It D Ta file was deleted -.It d Ta file's deletion was obstructed by local modifications +.It d Ta file's deletion was prevented by local modifications .It A Ta new file was added .It \(a~ Ta changes destined for a non-regular file were not merged .It ? Ta changes destined for an unversioned file were not merged @@ -1941,7 +1941,7 @@ using the following status codes: .It C Ta file was merged and conflicts occurred during merge .It ! Ta changes destined for a missing file were not merged .It D Ta file was deleted -.It d Ta file's deletion was obstructed by local modifications +.It d Ta file's deletion was prevented by local modifications .It A Ta new file was added .It \(a~ Ta changes destined for a non-regular file were not merged .It ? Ta changes destined for an unversioned file were not merged @@ -2171,7 +2171,7 @@ using the following status codes: .It C Ta file was merged and conflicts occurred during merge .It ! Ta changes destined for a missing file were not merged .It D Ta file was deleted -.It d Ta file's deletion was obstructed by local modifications +.It d Ta file's deletion was prevented by local modifications .It A Ta new file was added .It \(a~ Ta changes destined for a non-regular file were not merged .It ? Ta changes destined for an unversioned file were not merged @@ -2380,7 +2380,7 @@ Show the status of each affected file, using the follo .It C Ta file was unstaged and conflicts occurred during merge .It ! Ta changes destined for a missing file were not merged .It D Ta file was staged as deleted and still is deleted -.It d Ta file's deletion was obstructed by local modifications +.It d Ta file's deletion was prevented by local modifications .It \(a~ Ta changes destined for a non-regular file were not merged .El .Pp