git-merge-one: new merge world order.