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
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
2010-09-30
merge-recursive: Avoid doubly merging rename/add conflict contents
Elijah Newren
2010-09-30
t6036: Add testcase for undetected conflict
Elijah Newren
2010-09-30
t6036: Add a second testcase similar to the first but with content changes
Elijah Newren
2010-09-30
t6036: Test index and worktree state, not just that merge fails
Elijah Newren
2009-07-31
merge-recursive: don't segfault while handling rename clashes
Junio C Hamano