Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitbf4ec94

Browse files
committed
fixes#117
1 parentdf27b68 commitbf4ec94

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http
1616
* bugfixing on new UnifiedDiff reader / writer for multifile usage
1717
* bugfix for wrong DiffRow type while transforming from a patch that removed a line in one changeset
1818
* introduced change position into UnifiedDiff reader
19+
* introduced first version of conflict output possibility (like GIT merge conflict)
20+
* moved verification to`AbstractDelta`
21+
* introduced`ConflictOutput` to`Patch` to add optional behaviour to patch conflicts
1922

2023
##[4.9]
2124

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp