Am 01.02.2013 21:15 schrieb Junio C Hamano: >> TortoiseGitMerge is an improved version of TortoiseMerge specifically >> for use with Git on Windows. Due to MSYS path mangling [1], the ":" >> after the "base" etc. arguments to TortoiseMerge caused to whole >> argument instead of just the file name to be quoted in case of file >> names with spaces. So TortoiseMerge was passed >> >> "-base:new file.txt" >> >> instead of >> >> -base:"new file.txt" >> >> (including the quotes). To work around this, TortoiseGitMerge does not >> require the ":" after the arguments anymore which fixes handling file >> names with spaces. >> >> [1] http://www.mingw.org/wiki/Posix_path_conversion > > Sven? I just mailed a new patch. Thanks to Sebastian for pointing this out! @Junio: Feel free to optimize the commit message. -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html