projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c976260) | patch
t6036: Add a second testcase similar to the first but with content changes
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:45 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:37 +0000 (17:32 -0700)
commit583942df098b04f545fb6bbe7b0d1590cc7b7b1d
tree6dede22d80e0995405f9a25978cf8fa89d9cd88ftree | snapshot
parentc976260d0f3d3f99dc3594e3f98436bfd920dc97commit | diff
t6036: Add a second testcase similar to the first but with content changes

c94736a (merge-recursive: don't segfault while handling rename clashes
2009-07-30) added t6036 with a testcase that involved dual renames and a
criss-cross merge.  Add a test that is nearly identical, but which also
involves content modification -- a case git currently does not merge
correctly.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6036-recursive-corner-cases.sh diff | blob | history
Git—the stupid content tracker