Text - Diff (How to compare two files ?)

About

One of the most that you have to perform when you work in a migration of in a concurrent development environment is to check the difference between two text files.

Format

Text

See wiki/Diff

Git merge conflict resolution markings

The Git merge conflict resolution markings is a series of search/replace blocks.

<<<<<<< SEARCH
from flask import Flask
=======
import math
from flask import Flask
>>>>>>> REPLACE

unified diff format

--- mathweb/flask/app.py
+++ mathweb/flask/app.py
@@ ... @@
-class MathWeb:
+import sympy
+
+class MathWeb:

HTML

With the ins and del element, you can create visual diff.

Tools

Jdiff from JEDIT

Jedit can be use for this purpose with the plugin Jdiff.

WinMerge

• Edit > Options > Compare > Whitespace: Ignore All