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
/
t6020-merge-df.sh
Age
Commit message (
Expand
)
Author
2020-08-11
Collect merge-related tests to t64xx
Elijah Newren
2020-02-27
t6020: new test with interleaved lexicographic ordering of directories
Elijah Newren
2020-02-27
t6020, t6022, t6035: update merge tests to use test helper functions
Elijah Newren
2018-07-31
read-cache: fix directory/file conflict handling in read_index_unmerged()
Elijah Newren
2015-04-29
merge: deprecate 'git merge <message> HEAD <commit>' syntax
Junio C Hamano
2011-08-15
merge-recursive: Fix sorting order and directory change assumptions
Elijah Newren
2010-11-30
Merge branch 'en/merge-recursive'
Junio C Hamano
2010-10-07
test-lib: make test_expect_code a test command
Ævar Arnfjörð Bjarmason
2010-09-30
merge-recursive: Make room for directories in D/F conflicts
Elijah Newren
2010-09-30
handle_delete_modify(): Check whether D/F conflicts are still present
Elijah Newren
2010-09-30
t6020: Add a testcase for modify/delete + directory/file conflict
Elijah Newren
2010-09-30
t6020: Modernize style a bit
Elijah Newren
2010-07-10
merge_recursive: Fix renames across paths below D/F conflicts
Elijah Newren
2009-07-29
Add a reminder test case for a merge with F/D transition
Alex Riesen
2005-12-03
New test case: merge with directory/file conflicts
Fredrik Kuivinen