I like this! This is for the non-fastforward merge case. Do you think it should include how to handle fast-forward merges as well? (and / or what they should check to see what type of merge was performed if any...).