index 79824f4819863577fbc1a313e82c739d59ea3a0e..9cd51514dbfd987db4423e254e8bab7284352525 100644 (file)
------------
$ git checkout -m mytopic
Auto-merging frotz
-merge: warning: conflicts during merge
ERROR: Merge conflict in frotz
fatal: merge program failed
------------