Use git reset --merge for compatibility with older git

git merge --abort was added in git 1.7.4. RHEL6 ships git 1.7.3.

Comments added by: Michael Haggerty <mhagger@alum.mit.edu>