Skip to content

History, Kill Ring, and Completion Improvements #51

Merged
japanoise merged 8 commits intojapanoise:mainfrom
nicholascarroll:main
Jul 14, 2025
Merged

History, Kill Ring, and Completion Improvements #51
japanoise merged 8 commits intojapanoise:mainfrom
nicholascarroll:main

Conversation

@nicholascarroll
Copy link
Contributor

What does this change?

Resolves issue #43

Testing done

Basic smoke test such as using the editor, On Slackware.
Did a little Valgrind.

@nicholascarroll
Copy link
Contributor Author

It says there are merge conflicts but I don't think there are.

@nicholascarroll
Copy link
Contributor Author

kept all my changes since the conflicts were just formatting differences and duplicate commits.

japanoise
japanoise previously approved these changes Jul 12, 2025
Copy link
Owner

@japanoise japanoise left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Thanks for the hard work.

@japanoise
Copy link
Owner

Hmm. There are conflicts because our main branches have diverged. I think this should be based from a feature branch off japanoise/main if it's to be merged into this repository.

@japanoise japanoise self-requested a review July 12, 2025 18:30
@japanoise japanoise dismissed their stale review July 12, 2025 18:30

Rebase needed

@nicholascarroll
Copy link
Contributor Author

Oh I see! That was much easier!

@japanoise japanoise merged commit 9495fe0 into japanoise:main Jul 14, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants