Skip to content

add hypb smerge#716

Merged
matsl merged 4 commits intomasterfrom
add-hypb-smerge
Apr 26, 2025
Merged

add hypb smerge#716
matsl merged 4 commits intomasterfrom
add-hypb-smerge

Conversation

@matsl
Copy link
Copy Markdown
Collaborator

@matsl matsl commented Apr 25, 2025

What

  • Add ibut hypb-smerge
  • Add smerge to magit-status-mode

Why

It is convenient to use the <<<..., ===... and >>>... lines as
implicit buttons in magit-status-mode and in smerge-mode.

Notes

  • Docs have not been updated. (Will add that later if we proceed with
    this proposal.)
  • The ibut could go into hibtypes.el since it is small. (It is more a
    matter that hibtypes collects many dependencies but might not be an
    issue!?)
  • Maybe the simple name smerge for the ibut is preferred since ibuts
    are in their own ibut namespace (or at least prefixed name.)

@matsl matsl requested a review from rswgnu April 25, 2025 22:21
@rswgnu
Copy link
Copy Markdown
Owner

rswgnu commented Apr 26, 2025 via email

@matsl matsl force-pushed the add-hypb-smerge branch from 8103a2c to e76ad68 Compare April 26, 2025 08:27
@matsl
Copy link
Copy Markdown
Collaborator Author

matsl commented Apr 26, 2025

Agree with all the ideas in your summary.

Thanks. PR is updated except for the docs part. Stay tuned!

@matsl matsl force-pushed the add-hypb-smerge branch from e76ad68 to 54e65b2 Compare April 26, 2025 15:00
@matsl matsl merged commit 540c4a3 into master Apr 26, 2025
4 checks passed
@matsl matsl deleted the add-hypb-smerge branch April 26, 2025 15:04
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.

2 participants