summaryrefslogtreecommitdiffstats
path: root/nin/2configs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2018-10-23 19:26:37 +0200
committertv <tv@krebsco.de>2018-10-23 19:26:37 +0200
commit2751c1c3adf1d3140ae9b63bc399f998bb45cd1b (patch)
tree5920e1b5473a36574ac53b5aad698254a614f00d /nin/2configs
parent960e66201e35768e4439e59c8fe78b1976b914c4 (diff)
git-preview: add GIT_PREVIEW_MERGE_STRATEGY
Diffstat (limited to 'nin/2configs')
0 files changed, 0 insertions, 0 deletions