Created
November 29, 2024 11:04
-
-
Save farhaven/e5bd0de3f4499e7f63b218ef773ae228 to your computer and use it in GitHub Desktop.
A tool I use for managing Git conflicts in Acme.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/sh | |
| TOPLEVEL=$(git rev-parse --show-toplevel) | |
| git status | plumb -i -d edit -a 'filename=+Conflict' | |
| git status --porcelain | \ | |
| awk -v TL="$TOPLEVEL" '/^UU/{ print TL "/" $2 }' | \ | |
| xargs -n1 plumb -d edit -a 'addr=/^=======/' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment