On Wed, Dec 2, 2009 at 10:58, Jeremy Bopp wrote:
> There is a purpose built tool specifically to handle this which I
> mentioned in my reply.
My apologies - I am familiar with the cygpath tool but I had never
realised that it treats paths in the cygwin directory like that. I had
always thought it
David Antliff wrote:
> On Wed, Dec 2, 2009 at 10:11, Jeremy Bopp wrote:
>> David Antliff wrote:
>>> On the other hand, this command does work:
>>>
>>> kdiff3 --auto --L1 "build.xml (A)" --L2 "build.xml (B)"
>>> c:/cygwin-1.7/tmp/Vc0BZy_build.xml build.xml
>> As a fairly simple workaround, you could
2009/12/1 David Antliff:
> I need a way to
> translate "/tmp" to the Cygwin installation directory. I.e. it's not a
> simple case of replacing "/tmp" with "c:/tmp" but rather
> "$CYGWIN_INSTALL_DIR/tmp" and I'm not sure CYGWIN_INSTALL_DIR or
> anything similar exists.
Have a look at the cygpath ut
On Wed, Dec 2, 2009 at 10:11, Jeremy Bopp wrote:
> David Antliff wrote:
>> On the other hand, this command does work:
>>
>> kdiff3 --auto --L1 "build.xml (A)" --L2 "build.xml (B)"
>> c:/cygwin-1.7/tmp/Vc0BZy_build.xml build.xml
>
> As a fairly simple workaround, you could create a wrapper script wh
David Antliff wrote:
> In git-1.6.1.2 [1.5] and git-1.6.4.2 [1.7] there is a command called
> 'git-mergetool' that is used as a wrapper for various graphical
> merging tools, such as kdiff3. It makes local copies of the relevant
> commits and brings up an interactive gui for resolving merge conflic
My subject keeps getting blocked due to "spam-like" keywords, perhaps
it will work this time:
I'd like to report this here but I don't really have a general
solution. Perhaps someone who knows better can comment.
In git-1.6.1.2 [1.5] and git-1.6.4.2 [1.7] there is a command called
'git-mergetool
6 matches
Mail list logo
