summaryrefslogtreecommitdiff
path: root/t/t3309-notes-merge-auto-resolve.sh
Commit message (Expand)AuthorAgeFilesLines
* notes: teach git-notes about notes.<name>.mergeStrategy optionjk/notes-merge-configJacob Keller2015-08-171-0/+39
* notes: add notes.mergeStrategy option to select default strategyJacob Keller2015-08-171-0/+40
* git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"Johan Herland2010-11-171-0/+145
* git notes merge: Add automatic conflict resolvers (ours, theirs, union)Johan Herland2010-11-171-0/+502