Merge pull request #2457 from ethomson/merge_fix merge: don't open COMMIT_MSG unless we need to append conflicts
2014-07-11T14:18:49