diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:36 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:32:36 -0700 |
| commit | df0b99f00458dd0d442b17d78dd4c171a89f7bb2 (patch) | |
| tree | 0b31eed23a6b2f3fc208f33e1a68a4f820c124df /editor.c | |
| parent | 7edba4c45c33ba1e17d88907c1601dc660a44522 (diff) | |
| download | git-df0b99f00458dd0d442b17d78dd4c171a89f7bb2.tar.gz | |
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>
Diffstat (limited to 'editor.c')
0 files changed, 0 insertions, 0 deletions