-> git version 126.96.36.199
A 'git pull' operation exits with 1 (which is normal) but generates the
following output and error flows:
CONFLICT (content): Merge conflict in c/makefile
CONFLICT (content): Merge conflict in c/x_export.c
CONFLICT (content): Merge conflict in c/x_line.h
Automatic merge failed; fix conflicts and then commit the result.
* branch Xft -> FETCH_HEAD
With option -q the Error flow is empty and the Output is as before.
I would expect that the text:
> From /home/malaise/ada
> * branch Xft -> FETCH_HEAD
is part of stdout and suppressed with option -q
And that the message:
> Automatic merge failed; fix conflicts and then commit the result.
is part of stderr (and kept with option -q).
Or did I miss something?
Couldn't eradicate windows from my PC but I caged it in a vmware.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html