This version fixes the actual cause of the test failure (not being specific enough when adding files). This is done with a new version of patch 2. Patch 1 is unchanged and patch 3 only contains a minor change. This is built on da/difftool-fixes. There may be a small textual conflict with jk/difftool-dir-diff-edit-fix in the context lines but I don't believe there is any logical conflict. John Keeping (3): t7800: don't hide grep output t7800: fix tests when difftool uses --no-symlinks t7800: run --dir-diff tests with and without symlinks t/t7800-difftool.sh | 73 +++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 36 deletions(-) -- 1.8.2.324.ga64ebd9 -- 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