Git 1.7.7

1. a6a0909 git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" by Johan Herland · 15 years ago
2. 443259c git notes merge: List conflicting notes in notes merge commit message by Johan Herland · 15 years ago
3. 6abb365 git notes merge: Manual conflict resolution, part 2/2 by Johan Herland · 15 years ago
4. 809f38c git notes merge: Manual conflict resolution, part 1/2 by Johan Herland · 15 years ago
5. 3228e67 git notes merge: Add automatic conflict resolvers (ours, theirs, union) by Johan Herland · 15 years ago
6. 2085b16 git notes merge: Handle real, non-conflicting notes merges by Johan Herland · 15 years ago
7. 5688184 builtin/notes.c: Refactor creation of notes commits. by Johan Herland · 15 years ago
8. 75ef3f4 git notes merge: Initial implementation handling trivial merges only by Johan Herland · 15 years ago