Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t6036-recursive-corner-cases.sh
Age
Commit message (
Expand
)
Author
2020-02-27
merge-recursive: apply collision handling unification to recursive case
Elijah Newren
2019-11-10
Fix spelling errors in test commands
Elijah Newren
2019-08-19
merge-recursive: provide a better label for diff3 common ancestor
Elijah Newren
2018-12-01
t6036: avoid non-portable "cp -a"
Carlo Marcelo Arenas Belón
2018-11-08
t6036, t6043: increase code coverage for file collision handling
Elijah Newren
2018-11-08
merge-recursive: improve handling for rename/rename(2to1) conflicts
Elijah Newren
2018-11-08
merge-recursive: fix rename/add conflict handling
Elijah Newren
2018-11-08
merge-recursive: increase marker length with depth of recursion
Elijah Newren
2018-11-08
t6036, t6042: testcases for rename collision of already conflicting files
Elijah Newren
2018-10-18
merge-recursive: avoid showing conflicts with merge branch before HEAD
Elijah Newren
2018-08-03
Merge branch 'en/t6036-merge-recursive-tests'
Junio C Hamano
2018-08-03
Merge branch 'es/test-fixes'
Junio C Hamano
2018-07-17
t6000-t6999: fix broken &&-chains
Eric Sunshine
2018-07-12
t6036: fix broken && chain in sub-shell
Ramsay Jones
2018-07-11
t6036: add a failed conflict detection case: regular files, different modes
Elijah Newren
2018-07-07
t6036: add lots of detail for directory/file conflicts in recursive case
Elijah Newren
2018-07-04
t6036: add a failed conflict detection case with conflicting types
Elijah Newren
2018-07-04
t6036: add a failed conflict detection case with submodule add/add
Elijah Newren
2018-07-04
t6036: add a failed conflict detection case with submodule modify/modify
Elijah Newren
2018-07-04
t6036: add a failed conflict detection case with symlink add/add
Elijah Newren
2018-07-04
t6036: add a failed conflict detection case with symlink modify/modify
Elijah Newren
2018-07-03
t6036: fix broken "merge fails but has appropriate contents" tests
Eric Sunshine
2018-05-28
t6036: prefer test_when_finished to manual cleanup in following test
Elijah Newren
2018-05-28
t6036, t6042: prefer test_cmp to sequences of test
Elijah Newren
2018-05-28
t6036, t6042: prefer test_path_is_file, test_path_is_missing
Elijah Newren
2018-05-28
t6036, t6042: use test_line_count instead of wc -l
Elijah Newren
2018-05-28
t6036, t6042: use test_create_repo to keep tests independent
Elijah Newren
2016-05-18
Merge branch 'jc/ll-merge-internal'
Junio C Hamano
2016-05-10
t6036: remove pointless test that expects failure
Junio C Hamano
2016-05-10
ll-merge: use a longer conflict marker for internal merge
Junio C Hamano
2015-03-20
t: use test_must_fail instead of hand-rolled blocks
Jeff King
2015-03-20
t: fix trivial &&-chain breakage
Jeff King
2015-03-20
t: fix severe &&-chain breakage
Jeff King
2014-04-01
code and test: fix misuses of "nor"
Justin Lebar
2011-08-15
merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest
Elijah Newren
2011-08-15
t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify
Elijah Newren
2011-08-15
merge-recursive: Consider modifications in rename/rename(2to1) conflicts
Elijah Newren
2011-08-15
merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
Elijah Newren
2011-08-15
merge-recursive: Fix modify/delete resolution in the recursive case
Elijah Newren
2011-08-15
merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
Elijah Newren
2011-08-15
merge-recursive: Allow make_room_for_path() to remove D/F entries
Elijah Newren
2011-08-15
merge-recursive: Fix recursive case with D/F conflict via add/add conflict
Elijah Newren
2011-08-15
t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify
Elijah Newren
2011-08-15
t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify
Elijah Newren
2011-08-15
t6036: tests for criss-cross merges with various directory/file conflicts
Elijah Newren
2011-08-15
t6036: criss-cross with weird content can fool git into clean merge
Elijah Newren
2011-08-15
t6036: Add differently resolved modify/delete conflict in criss-cross test
Elijah Newren
2011-08-15
t6042: Add a testcase where git deletes an untracked file
Elijah Newren
2010-11-30
Merge branch 'en/merge-recursive'
Junio C Hamano
2010-11-09
tests: add missing &&
Jonathan Nieder
[next]