Merge pull request #412 from xifedI/patch-1

ben · ben · commit db7b65d51ee9 · 2015-09-11T11:55:52.000-07:00
import-hg.asc: change order of lines
diff --git a/book/09-git-and-other-scms/sections/import-hg.asc b/book/09-git-and-other-scms/sections/import-hg.asc
@@ -46,8 +46,8 @@ In this example, we want our file to look like this:
 ----
 bob=Bob Jones <bob@company.com>
 bob@localhost=Bob Jones <bob@company.com>
-bob jones <bob <AT> company <DOT> com>=Bob Jones <bob@company.com>
 bob <bob@company.com>=Bob Jones <bob@company.com>
+bob jones <bob <AT> company <DOT> com>=Bob Jones <bob@company.com>
 ----
 
 The next step is to create our new Git repository, and run the export script:

-Original file line number
+Diff line change
 ----
 bob=Bob Jones <[email protected]>
 bob@localhost=Bob Jones <[email protected]>
 -bob jones <bob <AT> company <DOT> com>=Bob Jones <[email protected]>
 bob <[email protected]>=Bob Jones <[email protected]>
 +bob jones <bob <AT> company <DOT> com>=Bob Jones <[email protected]>
 ----
 The next step is to create our new Git repository, and run the export script: