summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
Commit message (Expand)AuthorAgeFilesLines
* i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200Junio C Hamano2011-04-131-4/+4
* i18n: git-merge "You have not concluded your merge" messagesÆvar Arnfjörð Bjarmason2011-03-091-1/+1
* Merge branch 'en/merge-recursive'Junio C Hamano2010-11-291-1/+36
|\
| * t3030: Add a testcase for resolvable rename/add conflict with symlinksSchalk, Ken2010-09-291-1/+36
* | tests: add missing &&Jonathan Nieder2010-11-091-1/+1
|/
* Merge branch 'ks/recursive-rename-add-identical'Junio C Hamano2010-09-151-0/+35
|\
| * RE: [PATCH] Avoid rename/add conflict when contents are identicalSchalk, Ken2010-09-031-0/+35
* | unpack_trees: group error messages by typeMatthieu Moy2010-08-111-1/+1
|/
* merge-recursive: demonstrate an incorrect conflict with submoduleJohannes Sixt2010-06-111-0/+29
* Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-121-2/+4
* refuse to merge during a mergeClemens Buchacher2009-06-011-0/+3
* Remove empty directories in recursive mergeAlex Riesen2008-09-261-0/+11
* tests: use "git xyzzy" form (t0000 - t3599)Nanako Shiraishi2008-09-031-7/+7
* merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-231-0/+11
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-241-21/+21
* War on whitespaceJunio C Hamano2007-06-071-1/+0
* Remove case-sensitive file in t3030-merge-recursive.Brian Gernhardt2007-04-191-52/+52
* t3030: merge-recursive backend test.Junio C Hamano2007-04-101-0/+528