projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f1a0f45) | patch
t6022: Add testcase for merging a renamed file with a simple change
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:48 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:33 +0000 (14:19 -0700)
commit7dd9c304be5f9299d7b4b8ddb59072f774ecf081
treed35a7c37ab6670b958f8554f31dbb51607ba88datree | snapshot
parentf1a0f457b3d3cf3b4acea2addc1e26e7b931d474commit | diff
t6022: Add testcase for merging a renamed file with a simple change

This is a testcase that was broken by b2c8c0a (merge-recursive: When we
detect we can skip an update, actually skip it 2011-02-28) and fixed by
6db4105 (Revert "Merge branch 'en/merge-recursive'" 2011-05-19).  Include
this testcase to ensure we don't regress it again.

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