Skip to content

fix(bash): catch -X theirs/-s ours, the unilateral conflict resolution the outcome-keyed notice cannot see - #1971

Closed
wqymi wants to merge 1 commit into
mainfrom
fix/bash-unilateral-conflict-resolution
Closed

fix(bash): catch -X theirs/-s ours, the unilateral conflict resolution the outcome-keyed notice cannot see#1971
wqymi wants to merge 1 commit into
mainfrom
fix/bash-unilateral-conflict-resolution

fix(bash): catch `-X theirs`/`-s ours`, the unilateral conflict resol…

4426088
Select commit
Loading
Failed to load commit list.
Sign in for the full log view