関連ワード:  git merge disable auto commit    git cancel last merge    git cancel merge with conflicts  
結果 : git merge disable auto commit