summaryrefslogtreecommitdiff
path: root/t/t3310-notes-merge-manual-resolve.sh
AgeCommit message (Expand)AuthorFilesLines
2020-02-17Merge branch 'bc/hash-independent-tests-part-8'Libravatar Junio C Hamano1-26/+58
2020-02-07t3310: make test work with SHA-256Libravatar brian m. carlson1-26/+58
2020-01-27t3310: extract common notes_merge_files_gone()Libravatar Denton Liu1-12/+10
2018-08-27Merge branch 'sg/test-must-be-empty'Libravatar Junio C Hamano1-4/+4
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>'Libravatar SZEDER Gábor1-4/+4
2018-07-23refs.c: mark more strings for translationLibravatar Nguyễn Thái Ngọc Duy1-3/+3
2017-11-15notes: send "Automatic notes merge failed" messages to stderrLibravatar Todd Zullinger1-4/+4
2016-09-21i18n: notes-merge: mark die messages for translationLibravatar Vasco Almeida1-1/+1
2016-06-17i18n: notes: mark strings for translationLibravatar Vasco Almeida1-4/+4
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 12:19:58 +0000