summaryrefslogtreecommitdiff
path: root/t/t3309-notes-merge-auto-resolve.sh
AgeCommit message (Expand)Author
2015-08-17notes: teach git-notes about notes.<name>.mergeStrategy optionJacob Keller
2015-08-17notes: add notes.mergeStrategy option to select default strategyJacob Keller
2010-11-17git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland
2010-11-17git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland