* gitmerge.el: New file. * notes/git-workflow: Add documentation for using it.
Attach a file by drag & drop or click to upload
