Release v0.15.0 Mergiraf 0.15.0 2025-09-17 20:30:41 +02:00

Merged #614 feat(rust): Add derive attribute as commutative parent 2025-10-10 17:02:03 +02:00

Merged #608 fix: preserve CRLF newlines in solve and merge commands 2025-10-05 23:49:00 +02:00

Merged #607 fix(toml): Invalid signature for keys 2025-10-05 11:53:01 +02:00

Merged #563 chore: Better error types for TreeBuilder 2025-10-03 10:40:52 +02:00

Merged #602 perf: reduce the number of calls to git-check-attr 2025-10-02 10:51:36 +02:00

Merged #604 chore(lang_profile): rm leftover function 2025-10-02 07:48:07 +02:00

Merged #599 feat(Git): support reading language from git attributes 2025-09-30 14:30:09 +02:00

Merged #597 docs: Further improvements to the tutorial to add a language 2025-09-30 14:21:52 +02:00

Merged #590 feat(Python): Enable commutation of class attributes, with docstrings 2025-09-17 12:34:50 +02:00

Merged #596 doc: update adding-a-language.md 2025-09-17 11:30:09 +02:00

Merged #591 chore: Simplify pyproject language profile 2025-09-17 11:12:58 +02:00

Merged #592 chore: Update dependencies 2025-09-17 11:12:36 +02:00

Merged #582 feat: Support for pyproject.toml 2025-09-14 20:16:16 +02:00

Merged #588 fix(AstNode::bundle_comments): don't bundle at A, // comment \n B 2025-09-14 19:58:26 +02:00

Merged #527 tests: Utility to minimize test cases, continued 2025-09-11 23:47:23 +02:00

Merged #585 fix(typescript): Bad handling of semicolons in commutative merging of class bodies 2025-09-11 23:01:54 +02:00

Merged #587 fix: Reject parse trees with missing nodes 2025-09-11 23:01:33 +02:00

Proposed #611 fix(merged_tree): introduce cycle detection to mitigate a comment bundling bug 2025-10-07 17:36:26 +02:00

Closed #605 feature/rust: Mark derive macros as commutative 2025-10-10 17:02:04 +02:00

Closed #581 DOS line endings (CRLF) silently turn into Unix (LF) 2025-10-05 23:49:02 +02:00

Closed #606 toml: Spurious duplicate signature 2025-10-05 11:53:03 +02:00

Closed #594 Makefile parse error 2025-09-17 15:54:28 +02:00

Closed #589 feat: Support bundling Python docstrings on attributes 2025-09-17 12:34:51 +02:00

Closed #564 DisplaySettings: remove diff3? 2025-09-17 11:44:26 +02:00

Closed #314 Tracking Issue for go/field_with_trailing_comment 2025-09-15 15:09:57 +02:00

Closed #586 bug: Incorrect comment bundling after a separator 2025-09-14 19:58:27 +02:00

Closed #456 Test case minimizer 2025-09-11 23:47:23 +02:00

Closed #554 Parsing issues are not detected for MISSING tokens 2025-09-11 23:01:33 +02:00

Opened #589 feat: Support bundling Python docstrings on attributes 2025-09-15 15:21:44 +02:00

Opened #593 Allow falling back to zdiff3 2025-09-16 14:22:34 +02:00

Opened #594 Makefile parse error 2025-09-17 02:59:56 +02:00

Opened #595 New language: Clojure and EDN (LISP) 2025-09-17 07:02:59 +02:00

Opened #600 Migrate to the threeway_merge crate? 2025-09-17 20:58:08 +02:00

Opened #601 Rust: imports with the same signature not recongized as such 2025-09-18 20:22:38 +02:00

Opened #603 bug: merge cannot solve a conflict that solve can 2025-09-30 19:24:14 +02:00

Opened #605 feature/rust: Mark derive macros as commutative 2025-10-01 21:35:55 +02:00

Opened #606 toml: Spurious duplicate signature 2025-10-05 10:06:23 +02:00

Opened #609 Stack Overflow 2025-10-07 11:03:04 +02:00

Opened #610 Ignore files marked as linguist-generated=true 2025-10-07 11:12:38 +02:00

Opened #612 C: Doesn't deal with macro nonsense 2025-10-08 19:13:03 +02:00

Opened #613 Commutative merging when the commutative parent is absent from the base revision 2025-10-09 17:08:23 +02:00

Open #309 Tracking Issue for Tracking Issues 2025-10-09 17:09:15 +02:00

Open #102 Add option to accept merging files with syntax errors 2025-10-08 21:12:33 +02:00

Open #507 test(supported_langs): check that commutative parents' children all have signatures defined 2025-10-05 12:00:20 +02:00

Open #552 Better error types 2025-10-03 10:40:55 +02:00

Open #373 Imitate separators from non-conflicting parts when merging commutatively 2025-09-15 23:22:01 +02:00