commit e2e46a52587eb75658d760ffa601029710526d04 from: Stefan Sperling via: Thomas Adam date: Sat Mar 30 17:21:23 2024 UTC small man page fix, spotted by op@ commit - cd634f2d6d87577ed25d69f9b9a9d07c990a4223 commit + e2e46a52587eb75658d760ffa601029710526d04 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