git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"