summaryrefslogtreecommitdiff
path: root/t/t3308-notes-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2017-10-07t3308: create a real ref directory/file conflictLibravatar Jeff King1-1/+1
2016-01-17notes: allow merging from arbitrary referencesLibravatar Jacob Keller1-11/+11
2010-11-17git notes merge: Handle real, non-conflicting notes mergesLibravatar Johan Herland1-0/+188
2010-11-17git notes merge: Initial implementation handling trivial merges onlyLibravatar Johan Herland1-0/+180