summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
AgeCommit message (Expand)AuthorFilesLines
2015-08-17notes: add tests for --commit/--abort/--strategy exclusivityLibravatar Jacob Keller1-0/+12
2012-03-15notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdLibravatar Johan Herland1-4/+4
2012-03-15notes-merge: use opendir/readdir instead of using read_directory()Libravatar Johan Herland1-1/+1
2012-03-15t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/Libravatar Johan Herland1-0/+19
2011-12-08test: fix '&&' chainingLibravatar Ramkumar Ramachandra1-5/+5
2010-11-17git notes merge: --commit should fail if underlying notes ref has movedLibravatar Johan Herland1-0/+76
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