5 years ago 57ee5d5084 Stefan Sperling
allow callers of diff3 code to detect merge conflicts
5 years ago a551f2158d Stefan Sperling
diff3: make labels work and fix leaks
5 years ago 9f98de9c49 Stefan Sperling
declare got_merge_diff3()
5 years ago acb209ee71 Stefan Sperling
restore support for D_NORMAL diffs of regular files
6 years ago 404c43c4fa Stefan Sperling
basic 'got blame' implementation
6 years ago e97248b0f4 Stefan Sperling
prune unused declarations from got_lib_diff.h
6 years ago c48ceb4cb5 Stefan Sperling
remove support for the ifdef diff format from diffreg
6 years ago 1afa8e435b Stefan Sperling
remove REVERSE and NREVERSE diff output options from diffreg
6 years ago 6525c300e6 Stefan Sperling
forgot to delete D_EDIT in previous
6 years ago 119f86008e Stefan Sperling
remove support for "normal" diff output from diffreg
6 years ago 84e118513c Stefan Sperling
remove support for context diffs from diffreg.c
6 years ago a2a848a2c0 Stefan Sperling
remove ignore-lines pattern support from diffreg code
6 years ago 7673568311 Stefan Sperling
move diffreg's max_context into struct got_diff_state
6 years ago 718b3ab0e3 Stefan Sperling
rename the library-internal headers again to a common prefix