aboutsummaryrefslogtreecommitdiff
path: root/t/t3309-notes-merge-auto-resolve.sh
Commit message (Expand)AuthorAge
* git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-17
* git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-17