summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2022-07-23 01:53:11 +0000
committerJunio C Hamano <gitster@pobox.com>2022-07-22 21:45:22 -0700
commit11f4290001989fcd071e59382be0574a87be68fe (patch)
tree48acd22a72ef8c8d42af2657b3b9435c09753fed /builtin/merge.c
parente72d93e88cb20b06e88e6e7d81bd1dc4effe453f (diff)
merge-ort-wrappers: make printed message match the one from recursive
When the index does not match HEAD, the merge strategies are responsible to detect that condition and abort. The merge-ort-wrappers had code to implement this and meant to copy the error message from merge-recursive but deviated in two ways, both due to the message in merge-recursive being processed by another function that made additional changes: * It added an implicit "error: " prefix * It added an implicit trailing newline We can get these things by making use of the error() function. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions