summaryrefslogtreecommitdiff
path: root/zsh/rc
diff options
context:
space:
mode:
authorGrégoire Duchêne <gduchene@awhk.org>2022-01-29 13:24:54 +0000
committerGrégoire Duchêne <gduchene@awhk.org>2022-01-29 13:24:54 +0000
commit127705b957339b1d4b70ff33488d5b9b53872316 (patch)
treef7a2690c92cdcaeca979f691f081f72ef855545b /zsh/rc
parent36ad01f7fa3c94647860f3b0ed73879c608fcf12 (diff)
git: Set conflict style to ‘zdiff3’
Diffstat (limited to 'zsh/rc')
0 files changed, 0 insertions, 0 deletions