Everyone

Ludwig Gruber

Froyo

Use this diff utility to compare text, binary files (HexDiff), complete folders and SD-cards.
It can compare documents too (the unformated text of them).

+ And you can also store information about all the files located on your directories, to detect changed files later.

The functions of DiffTool in detail:

1. Compare 2 Texts:
- supports:
text files,
clipboard text, 
source code,
text of documents (Microsoft Office and Open Office),
compiled Android XML (diff Manifest file)
- supported file formats:
ASCII, ANSI, ISO-8859-1, Latin1, CP1252,
UNICODE (UTF-8/16/32 little and big endian),
DOCX, XLSX, PPTX,
ODT, ODS, ODP,
DOC, XLS, PPT, RTF(latin1 only)
- ignores differences on whitespace
- ignores end-of-line format differences (Unix,Windows,Mac)
- search for text or line numbers

2. Compare 2 Binary Files (HexDiff):
- files can have any format
- HEX and ASCII display
- checks differences on whitespace and end-of-line
- search for HEX, ASCII text or the address
- when having tons of bytes which differ, showing all details can take a while

3. Compare 2 Folders:
- checks if files are 100% BIT EXACT
(to compare by HASH run 4.)
- include or exclude subfolders
- compare the content of ZIP, JAR, EPUB and APK
- search for file names
- use double-click to compare/merge files or to merge/synchronize folders

4. Store Folders State:
- Stores the state containing the info of files located on your directories. By viewing this state later (see 5.) all files changed, since the state has been stored, are displayed.
- This feature can also be used to compare two SD-Cards. Store the state of card 1, after it, replace card 1 by card 2, view the stored state (see 5.) and all the files which differ will be shown.

5. View Stored Diff File:
- loads stored diff's, also of other Diff/Patch tools
- loads a folder state file and checks changes

6. View the Text of a File:
- views any text file, the text of supported documents and clipboard's text
- views AndroidManifest.XML of any APK

7. View a Binary File:
- Hex Viewer

8. FGrep:
- search for text in files and documents (find in files)

On the Result Screens:
- colors:
red = old content A
green = new content B
red/green = changed content
yellow = inline changes
black = identical content, A=B
- pinch-to-zoom
- export results as text
- works on big and small displays! (uses an integrated view instead of 2 panels)
- you can search for text, file names and line numbers
- press long on a file to open it
- pressing long on the left side, opens a scrollbar having diff info too

DiffTool is also an ideal source code viewer for all developers to check their changes on C, C++, HTML, PHP, C4droid *, Python ® **, AIDE ***, Java ® **** and any other source code.

Useful AddOns: 
- Fonts for DiffTool can be used to display Cyrillic, Chinese, Japanese, Korean, and other Unicode characters: (https://play.google.com/store/apps/details?id=com.difftool.fonts)
- DiffDroid can be used to start DiffTool from your file explorer: (https://play.google.com/store/apps/details?id=com.difftool.diffdroid)

This temporary version of DiffTool is currently free of charge and free of advertising!

= NO WARRANTY =
THE PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY. IT IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY, YOUR DEVICE, YOUR DATA AND PERFORMANCE OF THE PROGRAM IS WITH YOU.

* C4Droid is a product of n0n3m4.
** Python ® is a registered trademark of the Python Software Foundation (PSF).
*** AIDE is a product of the appfour GmbH
**** Java ® is a registered trademark of Sun Microsystems, Inc.
Gunakan utiliti diff ini untuk membandingkan teks, fail binari (HexDiff), folder lengkap dan kad SD.
Ia juga boleh membandingkan dokumen (teks yang tidak wujud).

+ Dan anda juga boleh menyimpan maklumat mengenai semua fail yang terdapat di direktori anda, untuk mengesan fail yang diubah kemudian.

Fungsi DiffTool secara terperinci: 

1. Bandingkan 2 Teks: 
- menyokong:
fail teks,
teks papan klip,
kod sumber,
teks dokumen (Microsoft Office dan Open Office),
dikumpulkan Android XML (fail Manifest diff)
- format fail yang disokong:
ASCII, ANSI, ISO-8859-1, Latin1, CP1252,
UNICODE (UTF-8/16/32 endian kecil dan besar),
DOCX, XLSX, PPTX,
ODT, ODS, ODP,
DOC, XLS, PPT, RTF (latin1 sahaja)
- mengabaikan perbezaan di ruang kosong
- mengabaikan perbezaan format akhir talian (Unix, Windows, Mac)
- cari nombor teks atau nombor baris

2. Bandingkan 2 Fail Perduaan (HexDiff): 
- fail boleh mempunyai sebarang format
- Paparan HEX dan ASCII
- menyemak perbezaan di ruang kosong dan akhir-line
- cari teks HEX, ASCII atau alamat
- apabila mempunyai banyak bait yang berbeza, menunjukkan semua butiran boleh mengambil sedikit masa

3. Bandingkan 2 Folder: 
- semak jika fail adalah 100% BIT EXACT
(untuk membandingkan dengan HASH run 4.)
- termasuk atau tidak termasuk subfolder
- bandingkan kandungan ZIP, JAR, EPUB dan APK
- cari nama fail
- gunakan klik dua kali untuk membandingkan / menggabungkan fail atau menggabungkan / menyegerakkan folder

4. Simpan Folder Negeri: 
- Menyimpan negeri yang mengandungi maklumat fail yang terletak di direktori anda. Dengan melihat keadaan ini kemudian (lihat 5.) semua fail diubah, kerana keadaan telah disimpan, dipaparkan.
- Ciri ini juga boleh digunakan untuk membandingkan dua kad SD. Simpan keadaan kad 1, selepas itu, ganti kad 1 dengan kad 2, lihat keadaan yang disimpan (lihat 5.) dan semua fail yang berbeza akan ditunjukkan.

5. Lihat fail Diff Stored: 
- beban disimpan diff, juga alat Diff / Patch lain
- memuatkan fail negara folder dan menyemak pemeriksaan

6. Lihat Teks Fail: 
- memaparkan sebarang fail teks, teks dokumen yang disokong dan teks clipboard
- melihat AndroidManifest.XML mana-mana APK

7. Lihat Fail Perduaan: 
- Hex Viewer

8. FGrep: 
- cari teks dalam fail dan dokumen (cari dalam fail)

Pada Skrin Keputusan: 
- warna:
merah = kandungan lama A
hijau = kandungan baru B
merah / hijau = kandungan berubah
kuning = perubahan sebaris
hitam = kandungan yang sama, A = B
- pinch-to-zoom
- hasil eksport sebagai teks
- berfungsi pada paparan besar dan kecil! (menggunakan pandangan bersepadu dan bukannya 2 panel)
- Anda boleh mencari teks, nama fail dan nombor baris
- Tekan lama pada fail untuk membukanya
- menekan panjang di sebelah kiri, membuka bar bergulir yang mempunyai maklumat diff juga

DiffTool juga merupakan penanda kod sumber ideal untuk semua pemaju untuk menyemak perubahan mereka pada C, C ++, HTML, PHP, C4droid *, Python ® **, AIDE ***, Java ® **** dan sebarang kod sumber lain.

AddOns yang berguna:
- Font untuk DiffTool boleh digunakan untuk memaparkan aksara Cyrillic, Chinese, Japanese, Korean, dan Unicode yang lain: (https://play.google.com/store/apps/details?id=com.difftool.fonts) 
- DiffDroid boleh digunakan untuk memulakan DiffTool dari explorer fail anda: (https://play.google.com/store/apps/details?id=com.difftool.diffdroid) 

Versi sementara ini DiffTool kini percuma dan bebas daripada pengiklanan!

= NO WARRANTY =
PROGRAM YANG DIPERBADANKAN TANPA MANA-MANA ​​JAMINAN. ITU DIBERIKAN "SEPERTI ADA" TANPA JAMINAN SEBARANG JENIS, SAMA ADALAH ATAU TERSIRAT, TERMASUK, TETAPI TIDAK TERHAD KEPADA, WARANTI TERSIRAT DENGAN KELAYAKAN DAN KESESUAIAN UNTUK TUJUAN TERTENTU. RISIKO TERHADAP KUALITI, PERANTI ANDA, DATA DAN PRESTASI PROGRAM ANDA DENGAN ANDA. 

* C4Droid adalah produk daripada n0n3m4.
** Python ® adalah tanda dagangan berdaftar Yayasan Perisian Python (PSF).
*** AIDE adalah produk dari appfour GmbH
**** Java ® adalah tanda dagangan berdaftar Sun Microsystems, Inc.


DiffTool the File Compare Tool

Versi Terkini DiffTool the File Compare Tool

Versi lain