Anonymous avatar Anonymous committed 4aa900e

Fixed sample output for 'daily.copy' test.

Comments (0)

Files changed (2)

en/examples/daily.copy.clone.out

 $ \textbf{cd ..}
 $ \textbf{hg clone my-copy your-copy}
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

en/examples/daily.copy.merge.out

 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 $ \textbf{hg merge}
-merging file and new-file
+merging file and new-file to new-file
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 $ \textbf{cat new-file}
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.