summaryrefslogtreecommitdiff
path: root/t/lib-read-tree-m-3way.sh
AgeCommit message (Collapse)Author
2005-06-08[PATCH] Add read-tree -m 3-way merge tests.Junio C Hamano
This adds a set of tests to make sure that requirements on existing cache entries are checked when a read-tree -m 3-way merge is run with an already populated index file. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-20[PATCH] Add tests for diff-treeJunio C Hamano
This adds and reorganizes some tests for diff-tree Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>