Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

• set encoding (via __CF_USER_TEXT_ENCODING) to utf-8 before calling …

…opendiff — it still gives a non-ASCII warning, but it does make utf-8 files show correctly

git-svn-id: http://svn.textmate.org/trunk/Bundles/Diff.tmbundle@3433 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
  • Loading branch information...
commit 955abb07a68b7697afa33b97f99a75aebe1312cb 1 parent a3b0e76
@sorbits sorbits authored
Showing with 3 additions and 0 deletions.
  1. +3 −0  Commands/Merge Selected Files.plist
View
3  Commands/Merge Selected Files.plist
@@ -7,6 +7,9 @@
<key>command</key>
<string>require_cmd opendiff "Opendiff comes with Apple's developer tools."
+# set utf-8 as the default encoding (used by opendiff)
+export __CF_USER_TEXT_ENCODING=$UID:0x8000100:0x8000100
+
eval arr=($TM_SELECTED_FILES)
if [[ ${#arr[@]} == 2 ]];
then opendiff "${arr[0]}" "${arr[1]}"; rescan_project
Please sign in to comment.
Something went wrong with that request. Please try again.