amiryal - Overview
Pinned Loading
-
Easily visualise Git merge.conflicts... Easily visualise Git merge.conflictstyle diff3 with meld, while preserving all information
1
[merge]
2
conflictstyle = diff3
3
tool = three_meld
4
[mergetool "three_meld"]
5
# Opens up four diff windows:
-
Minimal nginx http configuration Minimal nginx http configuration
1
# Nginx will still complain about opening /var/log/nginx/error.log before
2
# switching to stderr. When shutting down, it will also complain about not
3
# being able to delete /dev/null.
4
daemon off;
5
error_log stderr info;


