New Upstream Snapshot - liquidprompt
There were merge conflicts while merging a new upstream version.
More details
Historical runs
- upstream-merged-conflicts: Merging upstream version 2.1.2+git20221105.1.655ac38 resulted in conflicts.
- quilt-refresh-error: An error occurred refreshing quilt patch function_prefixes.patch: Applying patch debian/patches/function_prefixes.patch patching file liquidprompt Hunk #1 succeeded at 635 (offset 35 lines). Hunk #2 succeeded at 3160 with fuzz 1 (offset 352 lines). Hunk #3 succeeded at 3169 (offset 352 lines). Hunk #4 FAILED at 2882. Hunk #5 FAILED at 2895. Hunk #6 succeeded at 3376 (offset 434 lines). 2 out of 6 hunks FAILED -- rejects in file liquidprompt Patch debian/patches/function_prefixes.patch does not apply (enforce with -f)