summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
AgeCommit message (Expand)AuthorFilesLines
2010-11-17git notes merge: List conflicting notes in notes merge commit messageLibravatar Johan Herland1-0/+12
2010-11-17git notes merge: Manual conflict resolution, part 2/2Libravatar Johan Herland1-0/+176
2010-11-17git notes merge: Manual conflict resolution, part 1/2Libravatar Johan Herland1-0/+292