Edit two files side by side, showing differences.

Find a file

Andrew Hamilton 8ed82c768b Update pip install commands to workaround new pip resolver - lscolors dependency is now a package containing the LSCOLORS database and the path_colored function. - The new pip dependency resolver finds a conflict with fill3 and lscolors both depending on termstr, eventhough its the same version of termstr??		2022-05-11 23:04:41 +10:00
diff_edit	Update pip install commands to workaround new pip resolver	2022-05-11 23:04:41 +10:00
tests	editor: Add a class and function browser	2022-04-19 11:23:32 +10:00
BUGS	Fix crashes during scrolling	2022-03-08 10:06:47 +10:00
LICENSE	Initial commit.	2022-01-01 17:37:20 +10:00
README.md	Update pip install commands to workaround new pip resolver	2022-05-11 23:04:41 +10:00
setup.py	Update pip install commands to workaround new pip resolver	2022-05-11 23:04:41 +10:00
TODO	editor: Colourise the file name in the header	2022-04-30 14:17:35 +10:00

README.md

Diff-edit

Summary

Edit two files side by side, showing differences.

Installation

Install diff-edit directly using pip:

pip install --upgrade pip  # A recent version of pip is needed.
pip install --use-deprecated=legacy-resolver git+https://github.com/ahamilton/diff-edit

Or install from source:

git clone https://github.com/ahamilton/diff-edit
pip install --upgrade pip  # A recent version of pip is needed.
pip install --use-deprecated=legacy-resolver ./diff-edit

Then to run:

diff-edit -h