2015-07-08 15:24 GMT+02:00 Alexandre Bergel <alexandre.bergel@me.com>:

Thierry,

>> $ git config --get merge.mcVersion.driver
>
> ~/HackathonSattose2015> git config --get merge.mcVersion.driver
> pathToGitFileTree-MergeDriver/merge --version %O %A %B

Any idea how I can merge then?
Is this value what you expected?

No.

If you have your path for the merge command (something like

/User/Alexandre/GitFileTree-MergeDriver/merge ), then it should be:��

��~/HackathonSattose2015> git config --get merge.mcVersion.driver

��/User/Alexandre/GitFileTree-MergeDriver/merge��--version %O %A %B

To correct it, what you can do by hand is:

git config --global merge.mcVersion.driver "/User/Alexandre/GitFileTree-MergeDriver/merge --version %O %A %B"

git config --global merge.mcMethodProperties.driver "/User/Alexandre/GitFileTree-MergeDriver/merge --methodProperties %O %A %B"

git config --global merge.mcProperties.driver "/User/Alexandre/GitFileTree-MergeDriver/merge --properties %O %A %B"

Don't forget to update the path !

Thierry

Cheers,
Alexandre
--
_,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:
Alexandre Bergel�� http://www.bergel.eu
^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.