aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAnton Bobov <anton@bobov.name>2026-04-07 23:06:24 +0500
committerAnton Bobov <anton@bobov.name>2026-04-07 23:45:39 +0500
commit79edde180e69441837dc13f0398a7836249ca1cd (patch)
tree9fdde67927b470368b26c945be5d4224b8d3fa96 /.gitignore
parent04d513134f6907e24a010fbf5b0e5eb172ad9b38 (diff)
git: enable three-way merge for git am operations
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions