repositories / dotfiles

dotfiles

bugabingas dorkfiles

owned by bugabinga

svn diff scripts for windows

eb032ec8ab8b4335be5e176484b38bec3d132970

Oliver Krylow <o.krylow@isp-insoft.de> ·

unsigned

Browse filesCompare with HEAD

Changed files (3)

PC-00625.symlinks

Modified
41 41 helix/config.toml
42 42 ~/AppData/Roaming/helix/config.toml
44 +helix/languages.toml
45 +~/AppData/Roaming/helix/languages.toml
44 47 helix/themes
45 48 ~/AppData/Roaming/helix/themes

helix/languages.toml

Modified
1 1 [[language]]
2 -name = "java"
3 -auto-format = true
4 -# language-server = { command = "jdtls" }
5 -config = { "settings" = { "java" = { "saveActions" = { "organizeImports" = true } } } }
2 +name = "xml"
3 +auto-format = false
4 +language-server = { command = "lemminx" }

subversion/config

Modified
52 52 ### This will override the compile-time default, which is to use
53 53 ### Subversion's internal diff implementation.
54 54 # TODO windows versions as bat files
55 -diff-cmd = /home/oli/.subversion/diff
55 +diff-cmd = /home/oli/.subversion/diff.bat
56 56 ### Diff-extensions are arguments passed to an external diff
57 57 ### program or to Subversion's internal diff implementation.
58 58 ### Set diff-extensions to override the default arguments ('-u').
60 60 ### Set diff3-cmd to the absolute path of your 'diff3' program.
61 61 ### This will override the compile-time default, which is to use
62 62 ### Subversion's internal diff3 implementation.
63 -# diff3-cmd = /home/oli/.subversion/diff3
63 +# diff3-cmd = /home/oli/.subversion/diff3.bat
64 64 ### Set diff3-has-program-arg to 'yes' if your 'diff3' program
65 65 ### accepts the '--diff-program' option.
66 66 # diff3-has-program-arg = no
67 67 ### Set merge-tool-cmd to the command used to invoke your external
68 68 ### merging tool of choice. Subversion will pass 5 arguments to
69 69 ### the specified command: base theirs mine merged wcfile
70 -merge-tool-cmd = /home/oli/.subversion/merge
70 +merge-tool-cmd = /home/oli/.subversion/merge.bat
72 72 ### Section for configuring tunnel agents.
73 73 [tunnels]