summaryrefslogtreecommitdiffstats
path: root/t/t1000-read-tree-m-3way.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* [PATCH] Add read-tree -m 3-way merge tests.Junio C Hamano2005-06-091-12/+352
* [PATCH] Tests: read-tree -m test updates.Junio C Hamano2005-06-081-30/+28
* [PATCH] 3-way merge tests for new "git-read-tree -m"?Junio C Hamano2005-06-061-1/+18
* [PATCH] Make ls-* output consistent with diff-* output format.Junio C Hamano2005-05-271-49/+49
* [PATCH] Add tests for diff-treeJunio C Hamano2005-05-201-170/+1
* Fix up previous commitLinus Torvalds2005-05-201-0/+0
* [PATCH] Add the merge test Linus called "test script from hell".Junio C Hamano2005-05-151-0/+313