summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
AgeCommit message (Expand)Author
2018-08-27Merge branch 'sg/test-must-be-empty'Junio C Hamano
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>'SZEDER Gábor
2018-07-23refs.c: mark more strings for translationNguyễn Thái Ngọc Duy
2017-11-15notes: send "Automatic notes merge failed" messages to stderrTodd Zullinger
2016-09-21i18n: notes-merge: mark die messages for translationVasco Almeida
2016-06-17i18n: notes: mark strings for translationVasco Almeida
2015-08-17notes: add tests for --commit/--abort/--strategy exclusivityJacob Keller
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