summaryrefslogtreecommitdiff
path: root/epoch.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-06 06:18:16 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-06 06:33:38 (GMT)
commitc3f13d59f75e144e615b4a5b480348057a7b8b3f (patch)
tree1992ffdae5a13665332140edc125ac88b499e767 /epoch.h
parenta76d74fb7146d1785cdefc58a91c50ab9acec775 (diff)
downloadgit-c3f13d59f75e144e615b4a5b480348057a7b8b3f.zip
git-c3f13d59f75e144e615b4a5b480348057a7b8b3f.tar.gz
git-c3f13d59f75e144e615b4a5b480348057a7b8b3f.tar.bz2
[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>
Diffstat (limited to 'epoch.h')
0 files changed, 0 insertions, 0 deletions