Commit 97f3462ae699fae370cfa410ed58eb869ae6b276

Edward Thomson 2014-03-18T13:14:09

git_merge_status -> git_merge_analysis