Fix buffer warnings when untrailing lines
Fix typo when checking COMMIT_EDITMSG
Merge branch 'master' of github.com:vanubi/vanubi
Use commitmsg also for MERGE_EDITMSG