git merge file cli arguments misnamed

[cemoktra]

Current behavior 😯

Both "ours" and "theirs" are documented as "ours" in help

gix merge file --help
Merge a file by specifying ours, base and theirs

Usage: gix merge file [OPTIONS] <OURS> <BASE> <OURS>

Expected behavior 🤔

gix merge file --help
Merge a file by specifying ours, base and theirs

Usage: gix merge file [OPTIONS] <OURS> <BASE> <THEIRS>

Git behavior

No response

Steps to reproduce 🕹

No response

[Byron]

Thanks a lot, a fix is on the way!