Changes between Version 9 and Version 10 of MercurialTutorial


Ignore:
Timestamp:
07/10/13 11:20:59 (12 years ago)
Author:
trac
Comment:

—

Legend:

Unmodified
Added
Removed
Modified

  • MercurialTutorial

    v9 v10  
    170170If you've run hg merge, however, and want to recover your original files than I'm afraid you are out of luck.  The state of your files will have been lost and cannot be recovered.  The only way is to resolve the conflicts and check your local changes in along with the merged heads in your next commit.
    171171
     172