summaryrefslogtreecommitdiff
path: root/epoch.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-08 21:55:35 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 22:56:09 (GMT)
commitf225b21807a5f6ac589132e4d004e78038d23375 (patch)
tree59bcd6b273780f53869371a44b1376cc671d166e /epoch.c
parent8544a6f1b8e7340924c406d717ac37becd2f6046 (diff)
downloadgit-f225b21807a5f6ac589132e4d004e78038d23375.zip
git-f225b21807a5f6ac589132e4d004e78038d23375.tar.gz
git-f225b21807a5f6ac589132e4d004e78038d23375.tar.bz2
[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>
Diffstat (limited to 'epoch.c')
0 files changed, 0 insertions, 0 deletions