smashwilson/merge-conflicts — pull request #16 by smashwilson (2014-03-16 02:01:49+00:00)
Title: Context Menus

Add context menus to editors containing conflicts and to the `MergeConflictsView` panel. Implement corresponding actions for accepting ours-then-theirs and theirs-then-ours resolutions (#1), and all-theirs and all-ours file-level resolutions (#10).