# HG changeset patch # User David Soria Parra # Date 1255645143 -7200 # Node ID 70683e92aacbd598f88a4388672ea2837854f439 # Parent 4e1710cdae18a1950c93802fcc00700597a19d81# Parent fdb616b63365cabe28a4787c23a76c893965d9ea Merge http://bitbucket.org/segv/hg-website diff -r 4e1710cdae18 -r 70683e92aacb original/hgscm/templates/workflow_guide.html --- a/original/hgscm/templates/workflow_guide.html Fri Oct 16 00:17:17 2009 +0200 +++ b/original/hgscm/templates/workflow_guide.html Fri Oct 16 00:19:03 2009 +0200 @@ -224,6 +224,8 @@ +

Note: If you use Ubuntu and resolve doesn't work, you can either look into /etc/mercurial/hgrc.d/extdiff.rc, or install kdiff3 or some other tool listed in that file.

Mark the fixed file as resolved

$ hg resolve --mark conflicting_file
@@ -352,7 +354,7 @@

Now all others can point their browsers to his IP address (for example 192.168.178.100) at port 8000. They will then see all his history there and can sdecide if they want to pull his changes.

Now all others can point their browsers to his IP address (for example 192.168.178.100) at port 8000. They will then see all his history there and can decide if they want to pull his changes.

$ firefox http://192.168.178.100:8000
 
@@ -760,7 +762,7 @@
 
 If you now want to check some more complex workflows, please have a look at the general workflows wikipage.
 
-To deepen your understanding, you should also check the basic concept overview.
+To deepen your understanding, you should also check the basic concept overview.
 
 Have fun with Mercurial!