summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJon Seymour <jon.seymour@gmail.com>2005-07-06 16:39:35 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-06 17:29:30 (GMT)
commitff9206e72c71aa2e51c7cbee911f47b5838a5845 (patch)
treed4f74f740dfcb97670df7b69e64b252149db2bfb /cache.h
parent4d3a63ba3a1f80e03312c5ec28734b27583a0756 (diff)
downloadgit-ff9206e72c71aa2e51c7cbee911f47b5838a5845.zip
git-ff9206e72c71aa2e51c7cbee911f47b5838a5845.tar.gz
git-ff9206e72c71aa2e51c7cbee911f47b5838a5845.tar.bz2
[PATCH] Fixes a problem with --merge-order A B (A is linear descendent of a merge B)
This patch passes the test case introduced by the previous patch. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'cache.h')
0 files changed, 0 insertions, 0 deletions