[Python-checkins] devguide: Issue #18390: Add a little comment on how to do a proper file

[brett.cannon]

http://hg.python.org/devguide/rev/15249b189347
changeset:   624:15249b189347
user:        Brett Cannon <brett at python.org>
date:        Fri Jul 12 11:53:34 2013 -0400
summary:
  Issue #18390: Add a little comment on how to do a proper file
revert after a merge.

files:
  committing.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -385,7 +385,7 @@
 
    cd ../3.4
    hg merge 3.3
-   # Fix any conflicts; compile; run the test suite
+   # Fix any conflicts (e.g. ``hg revert -r default Misc/NEWS``); compile; run the test suite
    hg ci -m '#12345: merge with 3.3.'
 
 If you are not using the share extension, you will need to use

-- 
Repository URL: http://hg.python.org/devguide