summaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorJon Seymour <jon.seymour@gmail.com>2005-06-29 23:45:30 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-30 03:53:10 (GMT)
commitda4b932a0c5b249694216b1580b7bc2ded9e0280 (patch)
tree5a1cad9b859d06d0397bd56b5b1a7b1a6cd98328 /gitk
parentf3a3214e83be2905c57eff5d9035d169cae4644e (diff)
downloadgit-da4b932a0c5b249694216b1580b7bc2ded9e0280.zip
git-da4b932a0c5b249694216b1580b7bc2ded9e0280.tar.gz
git-da4b932a0c5b249694216b1580b7bc2ded9e0280.tar.bz2
[PATCH] Test case that demonstrates problem with --merge-order ^ processing
Added a test case that shows that --merge-order doesn't produce the correct result in the following case. A | | B |/ C | D git-rev-list --merge-order A ^B should produce just A. Instead it produces BCD. A subsequent patch will fix this defect. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'gitk')
0 files changed, 0 insertions, 0 deletions