rtk-ai__rtk/tests/fixtures/diff/git_diff_unmerged_raw.txt at develop - rtk-ai__rtk - GetSkill.work

skills/rtk-ai__rtk

mirror of https://github.com/rtk-ai/rtk.git synced 2026-09-19 07:33:17 +08:00

Files

T

kylehgc 7689020ca5 fix(diff): preclear round 2 -- file-level facts, sha256 mbox, contexts

- File-level facts outside hunks become note-only entries instead of
  vanishing while the stream condenses: 'Only in <dir>: <file>' and
  standalone 'Binary files ... differ' (GNU diff -r), '* Unmerged path'
  (git diff --ours during a merge), and 'Submodule <a>..<b>' headers.
  Suppressed inside mbox message regions, where column-0 prose is
  indistinguishable by value. Real fixtures captured for all four shapes;
  fix proven load-bearing by revert.
- is_mbox_from accepts 64-hex separators: SHA-256 repos' format-patch
  streams no longer fall back raw wholesale.
- .context() on the stdin read and raw-fallback write paths.
- Savings comment corrected to the measured corpus numbers (52-87%
  metadata-heavy, single digits content-heavy); exemption escalation
  unchanged.

2026-08-30 22:29:17 +00:00

14 lines

257 B

Plaintext

Raw Permalink Blame History

 * Unmerged path cfile.txt
 diff --git a/cfile.txt b/cfile.txt
 index 4520e44..ae914e1 100644
 --- a/cfile.txt
 +++ b/cfile.txt
@@ -1,3 +1,7 @@
  shared head
 +<<<<<<< HEAD
  conflict line MAIN-NEW
 +=======
 +conflict line SIDE-B
 +>>>>>>> conflict-side
  shared tail