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? Cheers, Alexandre -- _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;: Alexandre Bergel http://www.bergel.eu ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.
