Add "git merge" macros