summaryrefslogtreecommitdiff
path: root/notes-merge.c
AgeCommit message (Expand)AuthorFilesLines
2010-11-17git notes merge: Initial implementation handling trivial merges onlyLibravatar Johan Herland1-0/+120