summaryrefslogtreecommitdiff
path: root/git_dynamic.go
diff options
context:
space:
mode:
authorCarlos Martín Nieto <[email protected]>2018-02-22 09:46:42 +0100
committerCarlos Martín Nieto <[email protected]>2018-02-22 09:46:42 +0100
commit661e1a6f1b70a3f4837c4aec6a3006dcc5689bc6 (patch)
tree7bd3dc4990985590c7a910f09960df28cb0bad55 /git_dynamic.go
parentcff71166ec65cee1a070f04ac5c4d10fe3b009d9 (diff)
merge: expose the conflict marker size option
Diffstat (limited to 'git_dynamic.go')
0 files changed, 0 insertions, 0 deletions