summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
AgeCommit message (Expand)AuthorFilesLines
2010-11-29Merge branch 'en/merge-recursive'Libravatar Junio C Hamano1-1/+36
2010-11-09tests: add missing &&Libravatar Jonathan Nieder1-1/+1
2010-09-29t3030: Add a testcase for resolvable rename/add conflict with symlinksLibravatar Schalk, Ken1-1/+36
2010-09-15Merge branch 'ks/recursive-rename-add-identical'Libravatar Junio C Hamano1-0/+35
2010-09-03RE: [PATCH] Avoid rename/add conflict when contents are identicalLibravatar Schalk, Ken1-0/+35
2010-08-11unpack_trees: group error messages by typeLibravatar Matthieu Moy1-1/+1
2010-06-11merge-recursive: demonstrate an incorrect conflict with submoduleLibravatar Johannes Sixt1-0/+29
2010-01-12Be more user-friendly when refusing to do something because of conflict.Libravatar Matthieu Moy1-2/+4
2009-06-01refuse to merge during a mergeLibravatar Clemens Buchacher1-0/+3
2008-09-26Remove empty directories in recursive mergeLibravatar Alex Riesen1-0/+11
2008-09-03tests: use "git xyzzy" form (t0000 - t3599)Libravatar Nanako Shiraishi1-7/+7
2008-08-23merge: fix numerus bugs around "trivial merge" areaLibravatar Junio C Hamano1-0/+11
2008-05-24tests: do not use implicit "git diff --no-index"Libravatar Junio C Hamano1-21/+21
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+0
2007-04-19Remove case-sensitive file in t3030-merge-recursive.Libravatar Brian Gernhardt1-52/+52
2007-04-10t3030: merge-recursive backend test.Libravatar Junio C Hamano1-0/+528
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 10:38:33 +0000