Files
dotfiles/.config
Julian Prein d30b102e42 git: Set merge.conflictstyle to diff3
Display original text in addition to changes from both sides.
2024-09-21 00:03:34 +02:00
..
2023-12-01 03:43:06 +01:00
2020-12-28 03:09:02 +01:00
2024-09-21 00:03:34 +02:00
2022-07-12 21:00:04 +02:00
2023-06-23 17:43:58 +02:00
2021-10-05 12:01:46 +02:00