diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2022-05-18 09:07:29 +0200 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2022-05-18 09:07:29 +0200 |
| commit | ba6a213c2996710aa47990be2b7ad0fb14d35660 (patch) | |
| tree | 93d066cb1eef9888366442169b8d2e961c9111f0 /.gitignore | |
| parent | ssh: reorder hosts (diff) | |
| download | linux-home-ba6a213c2996710aa47990be2b7ad0fb14d35660.tar.gz linux-home-ba6a213c2996710aa47990be2b7ad0fb14d35660.zip | |
.gitconfig: merge.conflictStyle = diff3
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions