5 years ago Stefan Sperling
declare conflict marker strings in got_lib_diff.h
allow callers of diff3 code to detect merge conflicts
diff3: make labels work and fix leaks
declare got_merge_diff3()
restore support for D_NORMAL diffs of regular files
6 years ago Stefan Sperling
basic 'got blame' implementation
prune unused declarations from got_lib_diff.h
remove support for the ifdef diff format from diffreg
remove REVERSE and NREVERSE diff output options from diffreg
forgot to delete D_EDIT in previous
remove support for "normal" diff output from diffreg
remove support for context diffs from diffreg.c
remove ignore-lines pattern support from diffreg code
move diffreg's max_context into struct got_diff_state
rename the library-internal headers again to a common prefix