Commits


fix and simplify blame algorithm Always diff against latest version of file. This is much easier since there is no need to keep track of lines shifting around.


remove unused function got_diff_blob_file_lines_changed()


make stage -p show the number of changes in a file


initial 'got stage -p' implementation


introduce got_diff_blob_file_lines_changed()


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


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