Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sops mergetool #1374

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

sops mergetool #1374

wants to merge 2 commits into from

Commits on Dec 9, 2023

  1. init commit

    @stormentt
    stormentt committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    3e04d50 View commit details
    Browse the repository at this point in the history

  2. got the mergetool working

    @stormentt
    stormentt committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    6fc3a2c View commit details
    Browse the repository at this point in the history