Address
:
[go:
up one dir
,
main page
]
Include Form
Remove Scripts
Accept Cookies
Show Images
Show Referer
Rotate13
Base64
Strip Meta
Strip Title
Session Cookies
This website requires JavaScript.
Explore
About
FAQ
Help
Donate
Register
Sign in
mergiraf
/
mergiraf
Watch
9
Star
213
Fork
You've already forked mergiraf
45
Code
Issues
50
Pull requests
6
Releases
19
Activity
Actions
git(attributes): set the conflict marker size in all files
#202
Merged
wetneb
merged 1 commit from
ada4a/mergiraf:conflict_marker_size_everywhere
into
main
2025-02-12 09:24:37 +01:00
Conversation
1
Commits
1
Files changed
1
+1
-7
1 commit
Author
SHA1
Message
Date
Ada Alakbarova
e397a9898f
git(attributes): set the conflict marker size in all files
...
All checks were successful
/ test (pull_request)
Successful in 48s
Details
fixes
#199
2025-02-11 20:50:24 +01:00