[PATCH] contrib: add editmerge script for editor conflict prompts

[Matt Mackall]

On Fri, 2013-11-15 at 13:23 -0800, Durham Goode wrote:
> # HG changeset patch
> # User Durham Goode <durham at fb.com>
> # Date 1384550449 28800
> #      Fri Nov 15 13:20:49 2013 -0800
> # Node ID 23b877e29c1cdcec46687e8912f2e8aae69d2003
> # Parent  aa80446aacc3b1574211649cd8f190250b6b04b3
> contrib: add editmerge script for editor conflict prompts

Queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.