# HG changeset patch
# User Arne Babenhauserheide <bab@draketo.de>
# Date 1254135819 -7200
# Node ID 4f77a5b150579983ee8de56c405e89da1e8b8eca
# Parent  85a7a53db1a559729000df7abcaa16d0a47846ba
Added note: Resolve on Ubuntu needs kdiff3 or similar - systemwide config.

diff -r 85a7a53db1a5 -r 4f77a5b15057 hgscm/templates/workflow_guide.html
--- a/hgscm/templates/workflow_guide.html	Wed Sep 23 13:49:37 2009 +0200
+++ b/hgscm/templates/workflow_guide.html	Mon Sep 28 13:03:39 2009 +0200
@@ -224,6 +224,8 @@
 
 </pre>
 
+<p>Note: If you use Ubuntu and resolve doesn't work, you can either look into <em>/etc/mercurial/hgrc.d/extdiff.rc</em>, or install kdiff3 or some other tool listed in that file.</p> 
+
 <p>Mark the fixed file as resolved</p>
 
 <pre>$ hg resolve --mark conflicting_file