[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Edit conflict on PNG may open T-Merge

From: Oto BREZINA <brezina_at_printflow.eu>
Date: Mon, 20 May 2013 12:31:59 +0200

I just tried "Edit conflict" on conflicted .png file. T-Merge opens. For
diff T-IDiff is used.

I guess binary file detection failed to detect it is png, but for Diff
command we know it is not.

For versioned file we can check mime type if set. And take proper action.

Oto

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3055954

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-05-20 12:44:57 CEST

This message: [ Message body ]
Next message: ch3cooli: "RE: Re: [tortoisesvn] r24217 committed - * when saving, copy the file parameters first..."
Previous message: Stefan Küng: "Re: [tortoisesvn] r24217 committed - * when saving, copy the file parameters first..."

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.