fix an exception when only one side of a diff3 merge is change
Merge pull request #6 from GoBoundless/fix_single_change_merges

fix an exception when only one side of a diff3 merge is change