summaryrefslogtreecommitdiff
path: root/t/t3309-notes-merge-auto-resolve.sh
AgeCommit message (Expand)AuthorFilesLines
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Libravatar Johan Herland1-0/+145
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Libravatar Johan Herland1-0/+502