title: GUI for conflicts resolution
body: <p>I have a patch and directory to be patched. I can apply the patch with</p>
  
  <pre><code>patch -p0 --merge my.patch
  </code></pre>
  
  <p>The conflicts are marked then properly (using "&lt;&lt;&lt;&lt;", "====" and so on).</p>
  
  <p>The question is - is there a graphical tool that allow to resolve conflicts marked in such a way? Or is there any other way of graphical conflict resolution in the case i have only a patch and a set of files (directory) to be patched? I tried Kompare but it doesn't work well.</p>