Modify git merge info.

- Add precaution about merge conflicts.

bob.txt

@@ -6,3 +6,5 @@ $ git checkout TO
 
 Do merge:
 $ git merge FROM
+
+Beware of conflicts! :)