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
/
t4108-apply-threeway.sh
Age
Commit message (
Expand
)
Author
2021-12-20
git-apply: skip threeway in add / rename cases
Jerry Zhang
2021-09-06
apply: resolve trivial merge without hitting ll-merge with "--3way"
Junio C Hamano
2021-04-08
git-apply: allow simultaneous --cached and --3way options
Jerry Zhang
2021-04-07
git-apply: try threeway first when "--3way" is used
Jerry Zhang
2020-11-20
t4*: adjust the references to the default branch name "main"
Johannes Schindelin
2020-11-20
tests: mark tests relying on the current default for `init.defaultBranch`
Johannes Schindelin
2019-10-24
apply: respect merge.conflictStyle in --3way
Denton Liu
2019-10-24
t4108: demonstrate bug in apply
Denton Liu
2019-10-24
t4108: use `test_config` instead of `git config`
Denton Liu
2019-10-24
t4108: remove git command upstream of pipe
Denton Liu
2019-10-24
t4108: replace create_file with test_write_lines
Denton Liu
2012-07-10
apply: tests for the --3way option
Junio C Hamano
2012-07-10
apply: allow rerere() to work on --3way results
Junio C Hamano
2012-07-10
apply: register conflicted stages to the index
Junio C Hamano