Commit Briefs

Stefan Sperling

declare conflict marker strings in got_lib_diff.h

diff | patch | tree

Stefan Sperling

allow callers of diff3 code to detect merge conflicts

diff | patch | tree

Stefan Sperling

diff3: make labels work and fix leaks

diff | patch | tree

Stefan Sperling

declare got_merge_diff3()

diff | patch | tree

Stefan Sperling

restore support for D_NORMAL diffs of regular files

diff | patch | tree

Stefan Sperling

basic 'got blame' implementation

diff | patch | tree

Stefan Sperling

prune unused declarations from got_lib_diff.h

diff | patch | tree

Stefan Sperling

remove support for the ifdef diff format from diffreg

diff | patch | tree

Stefan Sperling

remove REVERSE and NREVERSE diff output options from diffreg

diff | patch | tree

Stefan Sperling

forgot to delete D_EDIT in previous

diff | patch | tree

Stefan Sperling

remove support for "normal" diff output from diffreg

diff | patch | tree

Stefan Sperling

remove support for context diffs from diffreg.c

diff | patch | tree

Stefan Sperling

remove ignore-lines pattern support from diffreg code

diff | patch | tree

Stefan Sperling

move diffreg's max_context into struct got_diff_state

diff | patch | tree

Stefan Sperling

rename the library-internal headers again to a common prefix

diff | patch | tree