Linus Torvalds writes: On Tue, Apr 10, 2018 at 10:12 AM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
I'm not sure what git version or flags you are using, but git merges it cleanly for me using the standard recursive merge policy. it cleanly for me using the standard recursive merge policy. Linus
Linus
Linus
<andriy.shevchenko@linux.intel.com> wrote:
[...]
two failed one-liner hunks situated in one file.I'm not sure what git version or flags you are using, but git merges it cleanly for me using the standard recursive merge policy. it cleanly for me using the standard recursive merge policy. Linus
Linus
Linus