Comment 6 for bug 1059670

Yep, same thing in a clean master:

jason@jason:~/Src/Evergreen (master)$ git checkout -b lp1059670 origin/master
Branch lp1059670 set up to track remote branch master from origin.
Switched to a new branch 'lp1059670'
jason@jason:~/Src/Evergreen (lp1059670)$ quickpick working/user/berick/invoice-search-persist-lp1059670
error: could not apply 1befc4c... ACQ invoice search persistence repaired
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
jason@jason:~/Src/Evergreen (lp1059670|CHERRY-PICKING)$ git status
# On branch lp1059670
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: Open-ILS/web/js/ui/default/acq/invoice/view.js
#
no changes added to commit (use "git add" and/or "git commit -a")