Harald Nordgren b0b3768367 sequencer: teach autostash apply to take optional conflict marker labels ...

Add label_ours, label_theirs, and label_base parameters to the autostash
apply machinery so callers can pass custom conflict marker labels
through to "git stash apply --label-ours/--label-theirs/--label-base".
Introduce apply_autostash_ref_with_labels() for callers that want
to pass labels.

Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2026-04-10 14:18:21 -07:00

9.3 KiB

Raw Blame History

View Raw