"george espinoza via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > From: george espinoza <gespinoz2019@xxxxxxxxx> > > Teach this command which currently handles its own argv to use > parse-options instead because parse-options helps make sure we handle > user input like -h in a standardized way across the project. Sorry, but why do we even want to do this? merge-ours is an implementation detail of "git merge" and is never run directly by end-users. I am not sure why it even needs "-h" in the first place, but that is already there, so letting sleeping dog lie would be what I would prefer. Is there a plan to add some -Xmerge-backend-option to this program, and would use of parse-options API make it easier? That would be a good reason to start using it in this program, but otherwise...