admin: Add documentation for gitmerge.el

* gitmerge.el: New file.
* notes/git-workflow: Add documentation for using it.