summaryrefslogtreecommitdiff
path: root/.gitignore.d
diff options
context:
space:
mode:
authorHendrik Jäger <gitcommit@henk.geekmail.org>2023-01-30 16:15:23 +0100
committerHendrik Jäger <gitcommit@henk.geekmail.org>2023-01-30 16:15:23 +0100
commitd9b6b2542410d7f21bcd59f1a69be1f6cc8a5e68 (patch)
treeb5bb77ba92ba1fbb01a069a26f4473d06921ca2f /.gitignore.d
parentde425f63f94ae39fcdc00428b7cacf8607141432 (diff)
feat: show common ancestor in merge conflicts
Diffstat (limited to '.gitignore.d')
0 files changed, 0 insertions, 0 deletions