Tree
- Tree:
ffef056fc42cc86d4327024a6df7e7565eb6ab2c
- Date:
- Message:
- 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@
Makefile | commits | blame |
git-repository.5 | commits | blame |
got-worktree.5 | commits | blame |
got.1 | commits | blame |
got.c | commits | blame |
got.conf.5 | commits | blame |