diff options
| author | Anton Bobov <anton@bobov.name> | 2026-04-07 23:06:24 +0500 |
|---|---|---|
| committer | Anton Bobov <anton@bobov.name> | 2026-04-07 23:45:39 +0500 |
| commit | 79edde180e69441837dc13f0398a7836249ca1cd (patch) | |
| tree | 9fdde67927b470368b26c945be5d4224b8d3fa96 /files/.zsh/grml-etc-core | |
| parent | 04d513134f6907e24a010fbf5b0e5eb172ad9b38 (diff) | |
git: enable three-way merge for git am operations
Diffstat (limited to 'files/.zsh/grml-etc-core')
0 files changed, 0 insertions, 0 deletions