[igt-dev] ✗ Fi.CI.BAT: failure for trace.pl fixes and improvements (rev2)

[Patchwork]

== Series Details ==

Series: trace.pl fixes and improvements (rev2)
URL   : https://patchwork.freedesktop.org/series/46177/
State : failure

== Summary ==

Applying: trace.pl: Fix no context colouring mode
Applying: trace.pl: Improve readability of graphical timeline representation
Using index info to reconstruct a base tree...
M	scripts/trace.pl
Falling back to patching base and 3-way merge...
Auto-merging scripts/trace.pl
CONFLICT (content): Merge conflict in scripts/trace.pl
Patch failed at 0002 trace.pl: Improve readability of graphical timeline representation
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".