Hash :0ff8d236 Author : Date :
2021-09-28T06:59:08
show commit progress output when 'got merge -c' is used
Otherwise no progress output is shown at all with this command.
Commit progress output will also display any additional changes
which resulted from conflict resolution.
ok millert@