TortoiseMerge problem with Power Shell scripts

I have found an issue where TortoiseMerge will not display diffs for Power Shell scripts. If a power shell script is created by the PS ISE the file format is such that TortoiseMerge does not recognize it. There is workaround though so I don't know whether a bug should be created or not. I am really posting this so if someone else runs into this problem they may find this post for the workaround.
The workaround is fairly simple. I just made sure I had exited the Power Script ISE and then I ran a unix2dos on the file and now TortoiseMerge can display the text in the file. This only has to be done once in that PS ISE leaves the file format alone on subsequent edits and saves. (So does VIM)

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-07-27 18:24:23 CEST