fix:与英语原文保持一致

Author: kang8

book/07-git-tools/sections/advanced-merging.asc

@@ -348,7 +348,11 @@ Automatic merge failed; fix conflicts and then commit the result.
 #! /usr/bin/env ruby
 
 def hello
+<<<<<<< HEAD
+  puts 'hola world'
+=======
   puts 'hello mundo'
+>>>>>>> mundo
 end
 
 hello()
@@ -380,7 +384,13 @@ $ git checkout --conflict=diff3 hello.rb
 #! /usr/bin/env ruby
 
 def hello
+<<<<<<< ours
+  puts 'hola world'
+||||||| base
+  puts 'hello world'
+=======
   puts 'hello mundo'
+>>>>>>> theirs
 end
 
 hello()