Skip to content

Conversation

@twaugh
Copy link
Owner

@twaugh twaugh commented Aug 18, 2025

Fixes #53

@twaugh twaugh force-pushed the combinediff-header branch 2 times, most recently from 3f6d0d2 to c57b2e5 Compare August 19, 2025 09:04
twaugh added 3 commits August 19, 2025 14:55
When combining diffs, the output should use the original file from the first patch and the
new file from the second patch.
Use different logic for outputting the delta headers depending on whether we're running
as interdiff or combinediff.

Assisted-by: Cursor
@twaugh twaugh force-pushed the combinediff-header branch from c57b2e5 to 95c9570 Compare August 19, 2025 13:55
@twaugh twaugh merged commit cab9c85 into master Aug 19, 2025
3 checks passed
@twaugh twaugh deleted the combinediff-header branch August 19, 2025 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

combinediff is setting incorrect paths to files

2 participants