summaryrefslogtreecommitdiff
path: root/t/t3308-notes-merge.sh
AgeCommit message (Expand)AuthorFilesLines
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