summaryrefslogtreecommitdiff
path: root/t/t4200-rerere.sh
AgeCommit message (Expand)AuthorFilesLines
2020-11-19t4*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-11/+11
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-08-13Merge branch 'ma/test-quote-cleanup'Libravatar Junio C Hamano1-1/+1
2020-08-06t: don't spuriously close and reopen quotesLibravatar Martin Ågren1-1/+1
2020-07-30t: remove test_oid_init in testsLibravatar brian m. carlson1-1/+0
2020-01-15t4200: make hash size independentLibravatar brian m. carlson1-1/+2
2018-09-24Merge branch 'en/rerere-multi-stage-1-fix'Libravatar Junio C Hamano1-0/+29
2018-09-17Merge branch 'tg/rerere'Libravatar Junio C Hamano1-0/+65
2018-09-11rerere: avoid buffer overrunLibravatar Elijah Newren1-1/+1
2018-09-11t4200: demonstrate rerere segfault on specially crafted mergeLibravatar Elijah Newren1-0/+29
2018-08-06rerere: recalculate conflict ID when unresolved conflict is committedLibravatar Thomas Gummerer1-0/+7
2018-08-06rerere: teach rerere to handle nested conflictsLibravatar Thomas Gummerer1-0/+37
2018-08-06rerere: fix crash with files rerere can't handleLibravatar Thomas Gummerer1-0/+21
2018-07-30tests: make use of the test_must_be_empty functionLibravatar Ævar Arnfjörð Bjarmason1-6/+3
2018-05-14t: switch $_z40 to $ZERO_OIDLibravatar brian m. carlson1-1/+1
2018-04-25Merge branch 'ps/test-chmtime-get'Libravatar Junio C Hamano1-4/+4
2018-04-09t/helper: 'test-chmtime (--get|-g)' to print only the mtimeLibravatar Paul-Sebastian Ungureanu1-4/+4
2018-03-27t/helper: merge test-chmtime into test-toolLibravatar Nguyễn Thái Ngọc Duy1-11/+11
2017-08-22rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedLibravatar Junio C Hamano1-0/+2
2017-08-22t4200: parameterize "rerere gc" custom expiry testLibravatar Junio C Hamano1-25/+33
2017-08-22t4200: gather "rerere gc" togetherLibravatar Junio C Hamano1-27/+27
2017-08-22t4200: make "rerere gc" test more robustLibravatar Junio C Hamano1-5/+14
2017-08-22t4200: give us a clean slate after "rerere gc" testsLibravatar Junio C Hamano1-0/+2
2016-04-06rerere: adjust 'forget' to multi-variant world orderLibravatar Junio C Hamano1-0/+10
2016-04-06rerere: gc and clearLibravatar Junio C Hamano1-6/+75
2016-03-15rerere: do use multiple variantsLibravatar Junio C Hamano1-1/+1
2016-03-15t4200: rerere a merge with two identical conflictsLibravatar Junio C Hamano1-0/+74
2016-03-15rerere: handle leftover rr-cache/$ID directory and postimage filesLibravatar Junio C Hamano1-1/+16
2013-11-06Merge branch 'fc/trivial'Libravatar Junio C Hamano1-1/+1
2013-10-31t: replace pulls with mergesLibravatar Felipe Contreras1-1/+1
2013-10-29t: use perl instead of "$PERL_PATH" where applicableLibravatar Jeff King1-4/+4
2012-08-27Fix tests under GETTEXT_POISON on parseoptLibravatar Jiang Xin1-2/+2
2012-06-24tests: enclose $PERL_PATH in double quotesLibravatar Junio C Hamano1-4/+4
2012-06-12t: Replace 'perl' by $PERL_PATHLibravatar Vincent van Ravesteijn1-4/+4
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano1-131/+277
2010-08-06rerere: migrate to parse-options APILibravatar Jonathan Nieder1-0/+91
2010-08-06t4200 (rerere): modernize styleLibravatar Jonathan Nieder1-125/+180
2010-07-14rerere: fix overeager gcLibravatar SZEDER Gábor1-3/+11
2010-03-20Use test_expect_success for test setupsLibravatar Brian Gernhardt1-34/+36
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsLibravatar Junio C Hamano1-0/+15
2009-05-06t4200: convert sed expression which operates on non-text file to perlLibravatar Brandon Casey1-1/+1
2009-05-06t4200: remove two unnecessary linesLibravatar Brandon Casey1-2/+0
2008-07-16Merge branch 'sb/dashless'Libravatar Junio C Hamano1-5/+5
2008-07-13t/: Use "test_must_fail git" instead of "! git"Libravatar Stephan Beyer1-5/+5
2008-07-13Move MERGE_RR from .git/rr-cache/ into .git/Libravatar Johannes Schindelin1-3/+3
2008-07-10builtin-rerere: more carefully find conflict markersLibravatar Olivier Marin1-6/+20
2008-06-22rerere.autoupdateLibravatar Junio C Hamano1-0/+10
2008-06-22t4200: fix rerere testLibravatar Junio C Hamano1-3/+3
2008-05-24tests: do not use implicit "git diff --no-index"Libravatar Junio C Hamano1-3/+3
2008-03-13more tr portability test script fixesLibravatar Jeff King1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 11:41:39 +0000