When merging strategy argument doesn't work

[slu]

Hi,

I'm using version 1.0.0 and selecting a merge strategy doesn't work.

I've fixed it by changing line 111 in magit-key-mode.el from

      ("-st" "Strategy" "--strategy" read-from-minibuffer)))

to

      ("-st" "Strategy" "--strategy=" read-from-minibuffer)))

i.e. adding a '=' after '--strategy'

It seems to fix the problem.

- slu