Clemens Buchacher <drizzd@xxxxxx> writes: > test_expect_success 'will not overwrite untracked file' ' > git reset --hard c1 && > - cat important > c2.c && > + cp important c2.c && > test_must_fail git merge c2 && > + test_path_is_missing .git/MERGE_HEAD && > test_cmp important c2.c > ' > > test_expect_success 'will not overwrite new file' ' > git reset --hard c1 && > - cat important > c2.c && > + cp important c2.c && Why? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html