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
Closed
fix(bash): catch -X theirs/-s ours, the unilateral conflict resolution the outcome-keyed notice cannot see#1971wqymi wants to merge 1 commit into
-X theirs/-s ours, the unilateral conflict resolution the outcome-keyed notice cannot see#1971wqymi wants to merge 1 commit into
