summaryrefslogtreecommitdiff
path: root/t/t4108-apply-threeway.sh
AgeCommit message (Expand)AuthorFilesLines
2012-07-09apply: tests for the --3way optionLibravatar Junio C Hamano1-0/+54
2012-07-09apply: allow rerere() to work on --3way resultsLibravatar Junio C Hamano1-0/+25
2012-07-09apply: register conflicted stages to the indexLibravatar Junio C Hamano1-0/+78