commit a4656c38219b986dc7919a9c5c36195b9dd0acee from: Stefan Sperling date: Thu Mar 28 14:35:04 2024 UTC small man page fix, spotted by op@ commit - f4ab0e5770b96257cb1a43cfe292daa54f2b402e commit + a4656c38219b986dc7919a9c5c36195b9dd0acee blob - 27fee027d191881e30323c0d8436d8803ffe5eca blob + e01e7ef4d015a4aeb526b10b764622c74dfe9f74 --- got/got.1 +++ got/got.1 @@ -825,7 +825,8 @@ Changes created on top of staged changes are indicated .Pp If the work tree contains the results of an interrupted .Cm got rebase , -.Cm got histedit, or +.Cm got histedit , +or .Cm got merge operation then display a message which shows the branches involved. .Pp