Commit 0ff8d236625b5d8329e10e9b812cbdef76917ba6
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@