[PATCH] git-resolve-script: Add LAST_MERGE and use git-rev-parse