diff options
| author | Elijah Newren <newren@gmail.com> | 2024-06-19 05:00:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-20 19:35:25 +0200 |
| commit | 14949d91b60176fa01850c2a3454cd72eb9bc5d6 (patch) | |
| tree | 90c549b7ebdc336896b767b27e596f0bc466ec9c /hex.c | |
| parent | merge-ort: loosen commented requirements (diff) | |
| download | git-14949d91b60176fa01850c2a3454cd72eb9bc5d6.tar.xz git-14949d91b60176fa01850c2a3454cd72eb9bc5d6.zip | |
merge-ort: upon merge abort, only show messages causing the abort
When something goes wrong enough that we need to abort early and not
even attempt merging the remaining files, it probably does not make
sense to report conflicts messages for the subset of files we processed
before hitting the fatal error. Instead, only show the messages
associated with paths where we hit the fatal error. Also, print these
messages to stderr rather than stdout.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'hex.c')
0 files changed, 0 insertions, 0 deletions