Mercurial > hg-website

changeset 241:4f77a5b15057

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added note: Resolve on Ubuntu needs kdiff3 or similar - systemwide config.
author Arne Babenhauserheide <bab@draketo.de>
date Mon, 28 Sep 2009 13:03:39 +0200
parents 85a7a53db1a5
children 300380748253
files hgscm/templates/workflow_guide.html
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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