summaryrefslogtreecommitdiff
path: root/t/t4108-apply-threeway.sh
AgeCommit message (Expand)Author
2012-07-10apply: tests for the --3way optionJunio C Hamano
2012-07-09apply: allow rerere() to work on --3way resultsJunio C Hamano
2012-07-09apply: register conflicted stages to the indexJunio C Hamano