aboutsummaryrefslogtreecommitdiff
path: root/notes-merge.h
Commit message (Expand)AuthorAge
* git notes merge: Initial implementation handling trivial merges onlyJohan Herland2010-11-17