Commit Diff
--- 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