git store merge conflict solution

HEAD

revision fcd00716711b3dce7625565ea1b2528f170081e4

raw

README.rst

Reference: https://git-scm.com/2010/03/08/rerere.html

Configuration:

$ git config --global rerere.enabled true

History

phorkie, the self-hosted, git-based pastebin software is available under the AGPL.