]> asedeno.scripts.mit.edu Git - git.git/commit
projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7edba4c) | patch
t6032: Add a test checking for excessive output from merge
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:36 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:36 +0000 (17:32 -0700)
commitdf0b99f00458dd0d442b17d78dd4c171a89f7bb2
tree0b31eed23a6b2f3fc208f33e1a68a4f820c124dftree | snapshot
parent7edba4c45c33ba1e17d88907c1601dc660a44522commit | diff
t6032: Add a test checking for excessive output from merge

Previous D/F fixes I submitted (5a2580d and ae74548) had caused merge to
become excessively spammy, which was fixed in 96ecac6 (merge-recursive:
Avoid excessive output for and reprocessing of renames 2010-08-20).  Add a
new test to avoid repeating that mistake with my several upcoming changes.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6032-merge-large-rename.sh diff | blob | history
local clone of git.git