projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a76d74f) | patch
[PATCH] 3-way merge tests for new "git-read-tree -m"?
authorJunio C Hamano <junkio@cox.net>
Mon, 6 Jun 2005 06:18:16 +0000 (23:18 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 6 Jun 2005 06:33:38 +0000 (23:33 -0700)
commitc3f13d59f75e144e615b4a5b480348057a7b8b3f
tree1992ffdae5a13665332140edc125ac88b499e767tree | snapshot
parenta76d74fb7146d1785cdefc58a91c50ab9acec775commit | diff
[PATCH] 3-way merge tests for new "git-read-tree -m"?

The updated git-tread-tree -m is more strict in that it wants to
have the original cache up to date.  The initial part of t1000
(merge tests from hell) fails due to it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
t/t1000-read-tree-m-3way.sh diff | blob | history
The core git plumbing