diff options
| author |  Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:48 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:33 -0700 |
| commit | 7dd9c304be5f9299d7b4b8ddb59072f774ecf081 (patch) | |
| tree | d35a7c37ab6670b958f8554f31dbb51607ba88da /fixup-builtins | |
| parent | t6022: New tests checking for unnecessary updates of files (diff) | |
| download | tgif-7dd9c304be5f9299d7b4b8ddb59072f774ecf081.tar.xz | |
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>
Diffstat (limited to 'fixup-builtins')
0 files changed, 0 insertions, 0 deletions