From: Elijah Newren <newren@gmail.com>
Date: Fri, 13 Aug 2010 01:50:49 +0000 (-0600)
Subject: t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
X-Git-Tag: v1.7.2.3~8^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3cee92369ec8cc908fe3a4307f08cfc22a9ba954?ds=sidebyside;hp=3cee92369ec8cc908fe3a4307f08cfc22a9ba954

t5520-pull: Add testcases showing spurious conflicts from git pull --rebase

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---