smashwilson/merge-conflicts — pull request #4 by smashwilson (2014-03-14 15:43:06+00:00)
Title: Edit in place

When you start editing within a conflict hunk, mark that side of the conflict as *dirty*. Change the display of that side of the hunk and reveal a "revert" button. Return to the original rendering if you click the revert button explicitly, or just edit the hunk back to its original state.