diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-01-21 11:22:12 +0000 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2018-01-21 11:47:43 +0000 |
| commit | db39807c8957d88593632f75f8e5e8661a646ee5 (patch) | |
| tree | f62f8db15c3f3705c38f30772176b377403d82c8 | |
| parent | 185b0d0823869bf180bb1d3541dd1dc0ca2447fe (diff) | |
| download | libgit2-ethomson/conflict_marker_size.tar.gz | |
CHANGELOG: include merge_file conflict marker sizeethomson/conflict_marker_size
| -rw-r--r-- | CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 305468192..ee516a668 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,12 @@ v0.26 + 1 ### Breaking API changes +* The `git_merge_file_options` structure now contains a new setting, + `marker_size`. This allows users to set the size of markers that + delineate the sides of merged files in the output conflict file. + By default this is 7 (`GIT_MERGE_CONFLICT_MARKER_SIZE`), which + produces output markers like `<<<<<<<` and `>>>>>>>`. + v0.26 ----- |