summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
AgeCommit message (Expand)Author
2020-08-10Collect merge-related tests to t64xxElijah Newren
2020-01-27t3030: use test_path_is_missing()Denton Liu
2019-10-15Merge branch 'en/merge-recursive-cleanup'Junio C Hamano
2019-09-20merge-recursive: symlink's descendants not in wayJonathan Tan
2019-08-19Ensure index matches head before invoking merge machinery, round NElijah Newren
2018-07-16t3030: fix broken &&-chainsEric Sunshine
2018-02-28t3030-merge-recursive: don't check the stderr of a subshellSZEDER Gábor
2018-01-09merge-recursive: do not look at the index during recursive mergeJunio C Hamano
2016-11-18submodules: allow empty working-tree dirs in merge/cherry-pickDavid Turner
2016-08-14merge-recursive: fix verbose output for multiple base treesRené Scharfe
2015-12-27t/t3030-merge-recursive.sh: use the $( ... ) construct for command substitutionElia Pinto
2015-10-26t6031: move triple-rename test to t3030Jeff King
2014-02-24merge-recursive.c: tolerate missing files while refreshing indexBrad King
2014-02-24t3030-merge-recursive: test known breakage with empty work treeBrad King
2013-06-07t3030: use test_ln_s_add to remove SYMLINKS prerequisiteJohannes Sixt
2011-12-09t3030 (merge-recursive): use test_expect_codeRamkumar Ramachandra
2011-08-14t3030: fix accidental success in symlink renameJeff King
2011-04-13i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200Junio C Hamano
2011-03-10i18n: git-merge "You have not concluded your merge" messagesÆvar Arnfjörð Bjarmason
2010-11-30Merge branch 'en/merge-recursive'Junio C Hamano
2010-11-09tests: add missing &&Jonathan Nieder
2010-09-30t3030: Add a testcase for resolvable rename/add conflict with symlinksSchalk, Ken
2010-09-15Merge branch 'ks/recursive-rename-add-identical'Junio C Hamano
2010-09-03RE: [PATCH] Avoid rename/add conflict when contents are identicalSchalk, Ken
2010-08-11unpack_trees: group error messages by typeMatthieu Moy
2010-06-11merge-recursive: demonstrate an incorrect conflict with submoduleJohannes Sixt
2010-01-12Be more user-friendly when refusing to do something because of conflict.Matthieu Moy
2009-06-02refuse to merge during a mergeClemens Buchacher
2008-09-26Remove empty directories in recursive mergeAlex Riesen
2008-09-03tests: use "git xyzzy" form (t0000 - t3599)Nanako Shiraishi
2008-08-24merge: fix numerus bugs around "trivial merge" areaJunio C Hamano
2008-05-24tests: do not use implicit "git diff --no-index"Junio C Hamano
2007-06-07War on whitespaceJunio C Hamano
2007-04-20Remove case-sensitive file in t3030-merge-recursive.Brian Gernhardt
2007-04-10t3030: merge-recursive backend test.Junio C Hamano