summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
Commit message (Expand)AuthorAgeFilesLines
* test: fix '&&' chainingRamkumar Ramachandra2011-12-081-5/+5
* git notes merge: --commit should fail if underlying notes ref has movedJohan Herland2010-11-171-0/+76
* git notes merge: List conflicting notes in notes merge commit messageJohan Herland2010-11-171-0/+12
* git notes merge: Manual conflict resolution, part 2/2Johan Herland2010-11-171-0/+176
* git notes merge: Manual conflict resolution, part 1/2Johan Herland2010-11-171-0/+292