summaryrefslogtreecommitdiff
path: root/t/t3309-notes-merge-auto-resolve.sh
AgeCommit message (Expand)AuthorFilesLines
2020-02-07t3309: make test work with SHA-256Libravatar brian m. carlson1-84/+144
2015-08-17notes: teach git-notes about notes.<name>.mergeStrategy optionLibravatar Jacob Keller1-0/+39
2015-08-17notes: add notes.mergeStrategy option to select default strategyLibravatar Jacob Keller1-0/+40
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