diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:20:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:20:41 -0700 |
| commit | df0c308c1a165e277ef3a7b8ae1457b926936d99 (patch) | |
| tree | 6964b83ee77096a6895e26d6ea2e444974dd0ec8 /git-merge-resolve.sh | |
| parent | Merge branch 'dt/submodule-diff-fixes' (diff) | |
| parent | entry: show finer-grained counter in "Filtering content" progress line (diff) | |
| download | tgif-df0c308c1a165e277ef3a7b8ae1457b926936d99.tar.xz | |
Merge branch 'ab/progress-users-adjust-counters'
The code to show progress indicator in a few code paths did not
cover between 0-100%, which has been corrected.
* ab/progress-users-adjust-counters:
entry: show finer-grained counter in "Filtering content" progress line
commit-graph: fix bogus counter in "Scanning merged commits" progress line
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions