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