MERGE STRATEGIES ---------------- The merge mechanism ('git-merge' and 'git-pull' commands) allows the backend 'merge strategies' to be chosen with `-s` option. Some strategies can also take their own options, which can be passed by giving `-X