2015-07-08 15:31 GMT+02:00 Alexandre Bergel <alexandre.bergel@me.com>:
> Then this means the make in GitFileTree-MergeDriver hasn't worked. When you did the make, what was the output?

It is:

-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
~/Dropbox/Workspace/GitFileTree-MergeDriver> make
mkdir pharo
cd pharo; wget -O- get.pharo.org/30+vm | bash
--2015-07-08 14:20:12--�� http://get.pharo.org/30+vm
Resolving get.pharo.org... 128.93.162.72
Connecting to get.pharo.org|128.93.162.72|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 2901 (2.8K) [text/html]
Saving to: 'STDOUT'

-�� �� �� �� �� �� �� �� �� ��100%[=====================>]�� ��2.83K�� --.-KB/s�� ��in 0s

2015-07-08 14:20:12 (146 MB/s) - written to stdout [2901/2901]

Downloading the latest 30 Image:
�� �� http://files.pharo.org/get-files/30/pharo.zip
Pharo.image
Downloading the latest pharoVM:
�� �� �� �� http://files.pharo.org/get-files/30/pharo-mac-stable.zip
pharo-vm/Pharo.app/Contents/MacOS/Pharo
Downloading PharoV30.sources:
�� �� �� �� http://files.pharo.org/get-files/30/sources.zip
Creating starter scripts pharo and pharo-ui
pharo/pharo pharo/Pharo.image --no-default-preferences eval --save Gofer new url: \'http://smalltalkhub.com/mc/ThierryGoubier/Alt30/main/\'\; package: \'GitFileTree-MergeDriver\'\; load
a GoferLoad
git config --global merge.mcVersion.driver "`pwd`/merge --version %O %A %B"
git config --global merge.mcMethodProperties.name "GitFileTree MergeDriver for Monticello"
git config --global merge.mcMethodProperties.driver "`pwd`/merge --methodProperties %O %A %B"
git config --global merge.mcProperties.name "GitFileTree MergeDriver for Monticello"
git config --global merge.mcProperties.driver "`pwd`/merge --properties %O %A %B"
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=

And after that, what is your

git config --get merge.mcVersion.driver ?


Please help :-)

I'm on it :)

Thierry
��

Alexandre