chiark / gitweb /
git-debrebase: merge: Actually record merge resolutions