log contrib/editmerge @ 20630:0b04ee8e789d

age author description
Fri, 15 Nov 2013 13:20:49 -0800 Durham Goode contrib: add editmerge script for editor conflict prompts