lael-labs
/
jj
Code
Issues
Pull Requests
Antique
Wiki
Insights
/
jj
/
cli
/
tests
/
sample-configs
/
valid
/
merge.toml
YN
Yuya Nishihara
files, tree: make same-change conflict resolution configurable
af4fe21
1 year ago
History
Code
Blame
4 lines · 92 B · TOML
Raw
Download
Copy shown lines
#:schema ../../../src/config-schema.json
[merge]
hunk-level = "line"
same-change = "accept"
#:schema ../../../src/config-schema.json [merge] hunk-level = "line" same-change = "accept"