Problem with git merge

[Jasper]

Hi

I really love git-cola. A very big thanks to the developers. (generally i mix using the terminal and git-cola)

I tried to merge two branches today and it didn't work. It gave the error "fatal: No commit specified and merge.defaultToUpstream not set."

After some searching this is the error you get when you just run "git merge" in the terminal.

In the cola-gui i clearly specified the branch I wanted to merge in master. Is this a bug, or am I just missing something?

I am using version 1.4.3.5 on Xubuntu 12.10.

Kind regards

Jasper

[David Aguilar]

Try the version from gthub. 1.4.3.5 is many years old.

cheers,
--
David