![]() ![]() The LC_CTYPE facet should be the relevant one, but start with LC_ALL first just to be sure. You can fix that by either recoding the files, or by starting the process in question with a different locale. ![]() For those using a GNU/Linux distribution as theirdevelopment platform ofchoice. Your locale indicates that text files are expected to be encoded as UTF-8. meld,opendiff, p4merge, tkdiff, tortoisemerge,vimdiff,andxxdiff. I believe its my Locale configuration, but can't discern what's amiss. Or it might inform the user about these issues, which would be even nicer, but apparently KDE doesn't go this far. Or it might consider the corresponding bytes to be errors and drop them from the file. It might start guessing, which apparently is what GTK does. I guess you might call this a feature, not a bug: when the application sees some byte sequences it cannot interpret as characters in the current locale, it has several options. GTK Meld (and all other GTK apps) handles the chars (ISO-8859-1 and UTF-8) quite well. Then I suggest you recode the files to UTF-8, merge them, then recode back if neccessary. ![]() Qt use flags for x11-libs/qt-core-4.8.2:4: exceptions glib iconv qt3support ssl (-aqua) -c++0x -debug -icu -pch ![]() If UTF-8 encoded files are presented to the tools, all non-latins are handled correctly. The Dejavu Monospace font is used, Courier New shows the same behavior. Both tools don't display the Umlauts and when the file is saved, they also disappear in the file. Actually I'm trying to merge two German files with KDiff3 and P4Merge (making "Whlen" out of "Wählen"). Hope this helps.Qt applications are deleting non-latin characters from ISO-8859 encoded files on my Gentoo system. So if the above description doesn't work for you chances the problem lies somewhere else. However I tried creating an empty repo somewhere on my drive with git init, add a file, commit it, then modify it, then I tried difftool and it worked. I'm not sure what was the problem in that repo. Note: I had a repository in which even if I did issue the git difftool or git mergetool commands P4Merge wouldn't start. Then just use git difftool or git mergetool to your hearts content. So remove other stuff like difftool.path and all that. LINUX P4MERGE WINDOWSIf p4merge is in this list then you just need to add the path where p4merge.exe resides to your %PATH% (on Windows I recommend Rapid Environment Editor for this).Īfter this is done you just need the following config to be in your. It'll list the available tools Git can use (because they've found them in your %PATH%) and the tools it could use (if they were installed). You can tell if this is the case or not by running git difftool -tool-help. Not sure if helps, but recent versions of Git support P4Merge (I use git version 2.17.0. When type of conflict is removed file conflict, git difftool command opens p4merge. I tried Smooth Git + P4merge but it does not work for me also I tried to do as described in External Merge and Diff Tools but I did not understand that. But when I use git difftool command in git bash, I expect p4merge but I see internal implementation of diff in git bash. =C:/Program Files/Perforce/p4merge.exeĭ=C:/Program Files/Perforce/p4merge.exe Git config -global "C:/Program Files/Perforce/p4merge.exe"Īnd these lines are from git config: merge.tool=p4merge Git config -global "C:/Program Files/Perforce/p4merge.exe" I follow this article and this one to setup and config p4merge: git config -global merge.tool p4merge I want to use p4merge as Git diff/merge tool. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |