0

I've upgraded my Mac to 10.9.2, and suddenly found that the vim would complain that the

--merge

option is unknown. But I haven't change my ~/.gitconfig, where the options exist and always works find until now.

Does this mean I need to upgrade or install something to fix it?

snowmantw
  • 1,611
  • 1
  • 13
  • 25
  • 2
    I've never seen vim with a --merge command line argument. What command do you have in your .gitconfig? – FDinoff Mar 28 '14 at 03:00
  • I don't know which tool added this line at my gitconfig: cmd = "vimdiff --merge \"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\"" But I remember that I don't modify this file. – snowmantw Mar 28 '14 at 07:12

1 Answers1

0

Well, I reset the command with:

cmd = "vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\""

Now it works. So this question is solved now. Thanks.

snowmantw
  • 1,611
  • 1
  • 13
  • 25