git notes merge: Add automatic conflict resolvers (ours, theirs, union)