## Changes

- Fix backward compatibility for legacy inline snapshot format. Snapshots
  using single-line content in multiline raw strings now correctly match
  again. (mitsuhiko#830)
- Handle merge conflicts in snapshot files gracefully. When a snapshot file
  contains git merge conflict markers, insta now detects them and treats
  the snapshot as missing, allowing tests to continue and create a new
  pending snapshot for review. (mitsuhiko#829)
- Skip nextest_doctest tests when cargo-nextest is not installed. (mitsuhiko#826)
- Fix functional tests failing under nextest due to inherited
  `NEXTEST_RUN_ID` environment variable. (mitsuhiko#824)

## Version Updates

- Bump version to 1.44.2 in `insta/Cargo.toml` and `cargo-insta/Cargo.toml`
- Update CHANGELOG.md with release notes
- Update Cargo.lock

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude <[email protected]>

## Changes

- Fix backward compatibility for legacy inline snapshot format. Snapshots
  using single-line content in multiline raw strings now correctly match
  again. (mitsuhiko#830)
- Handle merge conflicts in snapshot files gracefully. When a snapshot file
  contains git merge conflict markers, insta now detects them and treats
  the snapshot as missing, allowing tests to continue and create a new
  pending snapshot for review. (mitsuhiko#829)
- Skip nextest_doctest tests when cargo-nextest is not installed. (mitsuhiko#826)
- Fix functional tests failing under nextest due to inherited
  `NEXTEST_RUN_ID` environment variable. (mitsuhiko#824)

## Version Updates

- Bump version to 1.44.2 in `insta/Cargo.toml` and `cargo-insta/Cargo.toml`
- Update CHANGELOG.md with release notes
- Update Cargo.lock

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude <[email protected]>

## Summary

Prepare for the 1.44.2 patch release with four changes since 1.44.1.

## Changes

- Fix backward compatibility for legacy inline snapshot format.
Snapshots using single-line content in multiline raw strings now
correctly match again. (#830)
- Handle merge conflicts in snapshot files gracefully. When a snapshot
file contains git merge conflict markers, insta now detects them and
treats the snapshot as missing, allowing tests to continue and create a
new pending snapshot for review. (#829)
- Skip nextest_doctest tests when cargo-nextest is not installed. (#826)
- Fix functional tests failing under nextest due to inherited
`NEXTEST_RUN_ID` environment variable. (#824)

## Version Updates

- Bump version to 1.44.2 in `insta/Cargo.toml` and
`cargo-insta/Cargo.toml`
- Update CHANGELOG.md with release notes
- Update Cargo.lock

## Test plan

- [x] All tests pass
- [x] Pre-commit lints pass

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude <[email protected]>

…ko#830)

## Summary

This fixes a regression introduced in 1.44.0 where existing inline
snapshots using the legacy multiline format would fail to match.

**The problem:** PR mitsuhiko#563 changed how inline snapshots handle leading
newlines. This caused snapshots like:

```rust
insta::assert_snapshot!(value, @r"
    Unconflicted Mode(FILE) 0839b2e9412b
    ");
```

to fail when the actual value is `"Unconflicted Mode(FILE)
0839b2e9412b"`.

The legacy format stored single-line content in a multiline raw string
with source code indentation. After `from_inline_literal` processing,
this becomes `" Unconflicted...\n "` — the leading spaces from code
indentation weren't being stripped in the legacy comparison path.

**The fix:** In `matches_legacy`, detect the legacy
single-line-in-multiline pattern:

```rust
let is_legacy_single_line_in_multiline =
    sc.contents.contains('\n') && sc.contents.trim_end().lines().count() <= 1;
```

When this pattern is detected, apply `trim_start()` to strip the source
code indentation artifacts.

This ensures:
- ✅ Legacy snapshots continue to pass (with a warning to update)
- ✅ Modern single-line snapshots with intentional leading spaces are
preserved
- ✅ True multiline snapshots are unaffected

## Test plan

- [x] Added 8 comprehensive functional tests covering:
  - Single-line content in multiline format (the jj bug)
  - Raw string multiline variant
  - Force update reformatting works
  - True multiline content unaffected
  - Multiline with relative indentation preserved
  - Intentional leading spaces correctly fail (no false positives)
  - Trailing whitespace line edge case
  - Empty snapshot edge case
- [x] All 72 functional tests pass
- [x] Full test suite passes

Reported-by: jj-vcs/jj  
See: mitsuhiko#819 (comment)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude <[email protected]>

## Summary

Prepare for the 1.44.2 patch release with four changes since 1.44.1.

## Changes

- Fix backward compatibility for legacy inline snapshot format.
Snapshots using single-line content in multiline raw strings now
correctly match again. (mitsuhiko#830)
- Handle merge conflicts in snapshot files gracefully. When a snapshot
file contains git merge conflict markers, insta now detects them and
treats the snapshot as missing, allowing tests to continue and create a
new pending snapshot for review. (mitsuhiko#829)
- Skip nextest_doctest tests when cargo-nextest is not installed. (mitsuhiko#826)
- Fix functional tests failing under nextest due to inherited
`NEXTEST_RUN_ID` environment variable. (mitsuhiko#824)

## Version Updates

- Bump version to 1.44.2 in `insta/Cargo.toml` and
`cargo-insta/Cargo.toml`
- Update CHANGELOG.md with release notes
- Update Cargo.lock

## Test plan

- [x] All tests pass
- [x] Pre-commit lints pass

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude <[email protected]>