difftool: handle unmerged files in dir-diff mode

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index c0fd8dbb1c1bed55f541569e0c13cc865c39ec4f..54db1184a003897294b6aaa46bc6bf29faa919bc 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -401,7 +401,7 @@ static int batch_objects(struct batch_options *opt)
        save_warning = warn_on_object_refname_ambiguity;
        warn_on_object_refname_ambiguity = 0;
 
-       while (strbuf_getline(&buf, stdin, '\n') != EOF) {
+       while (strbuf_getline(&buf, stdin) != EOF) {
                if (data.split_on_whitespace) {
                        /*
                         * Split at first whitespace, tying off the beginning