git notes merge: Initial implementation handling trivial merges only