Bruno BELANYI e32ce32860 home: git: use 'zdiff3' merge conflict markers ... See GitHub's presentation about this feature [1]. [1]: https://github.blog/2022-01-24-highlights-from-git-2-35/		2022-03-11 14:11:32 +01:00
..
default.ignore	home: ssh: add 'work' host	2022-01-25 15:53:01 +01:00
default.nix	home: git: use 'zdiff3' merge conflict markers	2022-03-11 14:11:32 +01:00