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

to this example added ours/theirs policies and moved my-file.mrg to /lib direcory #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

to this example added ours/theirs policies and moved my-file.mrg to /lib direcory #4

wants to merge 2 commits into from

Commits on Feb 4, 2024

  1. Added ours/theirs policies

    @AlexeiKharchev
    AlexeiKharchev committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    3ac7584 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Changed git_drivers/*.sh

    @AlexeiKharchev
    AlexeiKharchev committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    12ef9f4 View commit details
    Browse the repository at this point in the history