index 97c51449f76af11f4eab55dc466aacbe79211134..66e570113a077d2c52c4fc3ac09d24a272df5301 100644 (file)
+
------------
$ git checkout mytopic
-fatal: Entry 'frotz' not uptodate. Cannot merge.
+error: You have local changes to 'frotz'; not switching branches.
------------
+
You can give the `-m` flag to the command, which would try a