Commit 02bf955f4a03c328a76185b13e8df3622034aecd

Edward Thomson 2014-07-02T15:42:15

merge: don't open COMMIT_MSG unless we need to append conflicts