Commit 1c0b6a38bacb54de300d936338d4adb04a9b311f

Edward Thomson 2014-03-11T17:58:10

Remove fastforward / uptodate from `git_merge`