diff options
| author |   Michael Conrad Tilstra <michael@gentoo.org> | 2001-06-05 16:31:49 +0000 |
|---|---|---|
| committer | Michael Conrad Tilstra <michael@gentoo.org> | 2001-06-05 16:31:49 +0000 |
| commit | db974b7e9bfad909fbe411aaca0d3ff08ceac16a (patch) | |
| tree | e041b205b0d77d84714de96be40cd3e3f5fe4654 /ChangeLog | |
| parent | o Uses diff3 to do a three-way directory merge (diff) | |
| download | gentoo-2-db974b7e9bfad909fbe411aaca0d3ff08ceac16a.tar.gz gentoo-2-db974b7e9bfad909fbe411aaca0d3ff08ceac16a.tar.bz2 gentoo-2-db974b7e9bfad909fbe411aaca0d3ff08ceac16a.zip | |
- adding xxdiff. Nice diff gui that supports diff3.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 6733a556287a..18f38a9530d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ date 5 June 2001 +new dev-util/xxdiff-1.9 +Nice gui diff viewer much like that found on SGIs. Supports 3way diffs too. +michael + new dev-util/mergetrees-0.9.3 Uses diff3 to do a three-way directory merge aj |