[PATCH 0 of 5] Interactive editor merge with markers

[Mads Kiilerich]

David Champion wrote, On 05/10/2010 06:48 PM:
> This patch series:
> 1. changes tool.premerge to accept a boolean (as now) or the word 'keep'
>     to keep merge markers in the $local file;
> 2. adds the tool.check option, incorporating tool.checkconflicts and
>     tool.checkchanged functions (tool.check = conflicts, changed)
> 3. adds tool.check = prompt to prompt the user for merge success
>    

Much (most?) of the existing merge-tool functionality is tested by 
test-merge-tools.

Could you add tests for the new functionality?

/Mads