commit - 1acd48bccbe935fbbd39c3387b92b0fb6aaf444f
commit + f365d76274ee1ae2b57225686a0733176fc4bfb2
blob - ad59381b01b718149650684acc9d252cdfdf08dc
blob + 06422c812cb6a86575f656e0a5293c72ed775769
--- got/got.1
+++ got/got.1
.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
.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
.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
.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
.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
.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