Patrick Steinhardt 367084e3c1 Implement merging of index entries. ...

This allows us to generate a textual diff of conflicting files in
bare repositories by performing a merge on the index followed by
repo.merge_file_from_index on the resulting index entries.

2015-03-11 16:08:13 +01:00

19 KiB

Raw Blame History

View Raw