Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
A view that takes an original file and a text-form diff and displays it in a graphical form, and can selectively apply the modifications it contains.
Objective-C
branch: master

Fetching latest commit…

Cannot retrieve the latest commit at this time

Failed to load latest commit information.
AngelDiff.xcodeproj
English.lproj
AngelDiff_Prefix.pch
AppDelegate.h
AppDelegate.m
Info.plist
README.txt
Testfile1.diff
Testfile1.merged.txt
Testfile1.txt
Testfile1.udiff
Testfile2.txt
UKDiffParser.h
UKDiffParser.m
UKDiffView.h
UKDiffView.m
UKDiffViewChooseLeft.pdf
UKDiffViewChooseRight.pdf
UKObjectLogger.h
UKObjectLogger.m
main.m

README.txt

UKDIFFVIEW
-----------

A simple NSView subclass that takes an original file and a text-form diff and displays it in a graphical form, and can selectively apply the modifications it contains.

This currently handles regular diffs, like:

6c6
< foo
---
> bar

and diffs in unified diff format, like:

--- /path/to/file1.txt	2004-01-03 00:12:34.000000000 +0100
+++ /path/to/file2.txt	2008-08-02 12:34:56.000000000 +0200
@@ -3,7 +3,7 @@
context
context
context
- foo
+ bar
context
context


IMPORTANT
---------

This project uses the UliKit. You *must* check out UliKit into a folder next to the UKDiffView folder to have this project compile.


LICENSE
-------

Copyright 2008 M. Uli Kusterer.

This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.

Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:

   1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.

   2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.

   3. This notice may not be removed or altered from any source distribution.
Something went wrong with that request. Please try again.