| commit | ae1e948a3179529896cf69272a0c1b45ab8ced1c | |
| author | Stefan Sperling <stsp@stsp.name> | |
| Tue, 28 Sep 2021 06:59:08 +0000 (28 06:59 +0000) | ||
| committer | Thomas Adam <thomas@xteddy.org> | |
| Tue, 28 Sep 2021 23:20:09 +0000 (29 00:20 +0100) | ||
| tree | 06286ebb76e22461c37cd44aa67ee082c20c8de4 | treesnapshot (tar.gz zip) |
| parent | def2f97048d39f24c4938a0ef92b6294480482c2 | commitdiff |
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@
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@
| got/got.c | diffblobblamehistory | |
| include/got_worktree.h | diffblobblamehistory | |
| lib/worktree.c | diffblobblamehistory | |
| regress/cmdline/merge.sh | diffblobblamehistory |