aboutsummaryrefslogtreecommitdiff
path: root/t/t4108-apply-threeway.sh
Commit message (Expand)AuthorAge
* apply: tests for the --3way optionJunio C Hamano2012-07-09
* apply: allow rerere() to work on --3way resultsJunio C Hamano2012-07-09
* apply: register conflicted stages to the indexJunio C Hamano2012-07-09