Commit ccb308273a8662a9692849115a929bd1a74a15f7

Edward Thomson 2014-03-11T17:19:35

Add `git_merge_status` to provide info about an upcoming merge