| commit | d6d9e76d7f06c5ba94517d258e051544885780c5 | |
| author | Jeff King <peff@peff.net> | |
| Fri, 25 Mar 2011 18:09:03 +0000 (25 14:09 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 25 Mar 2011 21:13:57 +0000 (25 14:13 -0700) | ||
| tree | 439d50fd7b9f9d264efb487df528c80b1120da7e | treesnapshot (tar.gz zip) |
| parent | 8523d071ad350539ab0f7e6efe192b8530320962 | commitdiff |
t7607: clean up stray untracked file
This file ends up conflicting with the test just after it
(causing the "git merge" to fail). Neither test is to blame
for the bug, though. It looks like the merge in 1a9fe45
(Merge branch 'tr/merge-unborn-clobber', 2011-02-09) is what
caused the conflict.
We didn't notice because the follow-on test is already
marked as expect_failure (even though it has since been
fixed, and now succeeds once the untracked file is moved out
of the way).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This file ends up conflicting with the test just after it
(causing the "git merge" to fail). Neither test is to blame
for the bug, though. It looks like the merge in 1a9fe45
(Merge branch 'tr/merge-unborn-clobber', 2011-02-09) is what
caused the conflict.
We didn't notice because the follow-on test is already
marked as expect_failure (even though it has since been
fixed, and now succeeds once the untracked file is moved out
of the way).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7607-merge-overwrite.sh | diffblobblamehistory |