]> git.netwichtig.de Git - user/henk/vcsh/git.git/commit
feat: show common ancestor in merge conflicts
authorHendrik Jäger <gitcommit@henk.geekmail.org>
Mon, 30 Jan 2023 15:15:23 +0000 (16:15 +0100)
committerHendrik Jäger <gitcommit@henk.geekmail.org>
Mon, 30 Jan 2023 15:15:23 +0000 (16:15 +0100)
commitd9b6b2542410d7f21bcd59f1a69be1f6cc8a5e68
treeb5bb77ba92ba1fbb01a069a26f4473d06921ca2f
parentde425f63f94ae39fcdc00428b7cacf8607141432
feat: show common ancestor in merge conflicts
.config/git/config