projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8544a6f) | patch
[PATCH] Add read-tree -m 3-way merge tests.
authorJunio C Hamano <junkio@cox.net>
Wed, 8 Jun 2005 21:55:35 +0000 (14:55 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 22:56:09 +0000 (15:56 -0700)
commitf225b21807a5f6ac589132e4d004e78038d23375
tree59bcd6b273780f53869371a44b1376cc671d166etree | snapshot
parent8544a6f1b8e7340924c406d717ac37becd2f6046commit | diff
[PATCH] Add read-tree -m 3-way merge tests.

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>
t/lib-read-tree-m-3way.sh diff | blob | history
t/t1000-read-tree-m-3way.sh diff | blob | history
The core git plumbing