Changes between Version 6 and Version 7 of MercurialTutorial

Timestamp:

06/09/11 18:00:49 (14 years ago)

Author:

Christina Haig

Comment:

—

MercurialTutorial

@@ -103 +103 @@
 
 If it is a changeset that you want to apply then you will need to perform a merge
-''' Before you run hg merge I strongly recommend you create/edit your .hgrc file to include merge=internal:merge '''
+''' Before you run hg merge I strongly recommend you create/edit your .hgrc file to include merge=internal:merge. '''  In fact, you must have an .hgrc file before you can check in to your repository.  This can be done by creating an .hgrc file in your $HOME directory with the following in the text file:
 {{{
 [ui]