git-checkout -m: fix merge case