summaryrefslogtreecommitdiff
path: root/local-pull.c
diff options
context:
space:
mode:
authorJon Seymour <jon.seymour@gmail.com>2005-06-23 02:01:09 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 02:15:04 (GMT)
commit6e4c0a51092e3ec3429ca91890b99e198aa367bd (patch)
tree07d7dbfa3ffe9639e994f7117232ce85fac1baa1 /local-pull.c
parente4bcaac17e8959eb970a348519a25d0d396395f0 (diff)
downloadgit-6e4c0a51092e3ec3429ca91890b99e198aa367bd.zip
git-6e4c0a51092e3ec3429ca91890b99e198aa367bd.tar.gz
git-6e4c0a51092e3ec3429ca91890b99e198aa367bd.tar.bz2
[PATCH] A test case that demonstrates a problem with merges with two roots.
git-rev-list --merge-order is omitting one of the roots when displaying a merge containing two distinct roots. A subsequent patch will fix the problem. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'local-pull.c')
0 files changed, 0 insertions, 0 deletions