summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
AgeCommit message (Expand)Author
2012-03-15notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwdJohan Herland
2012-03-15notes-merge: use opendir/readdir instead of using read_directory()Johan Herland
2012-03-15t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/Johan Herland
2011-12-09test: fix '&&' chainingRamkumar Ramachandra
2010-11-17git notes merge: --commit should fail if underlying notes ref has movedJohan Herland
2010-11-17git notes merge: List conflicting notes in notes merge commit messageJohan Herland
2010-11-17git notes merge: Manual conflict resolution, part 2/2Johan Herland
2010-11-17git notes merge: Manual conflict resolution, part 1/2Johan Herland