fix: `gix merge file` now uses `THEIRS` instead of `OURS` where needed (#1703)#1704

Merged

Byron merged 1 commit intomainfrom fix-1703

Nov 25, 2024

+1-1

Commits on Nov 25, 2024

fix: gix merge file now uses THEIRS instead of OURS where needed (#1703 )
Byron
committed