$ git merge test
diff: missing operand
diff: Try `diff --help' for more information.
patch: **** Only garbage was found in the patch input.
Auto-merging lipsum.txt
CONFLICT (content): Merge conflict in lipsum.txt