update repo
This commit is contained in:
parent
ff208644c2
commit
8adb7bd764
24
.editorconfig
Normal file
24
.editorconfig
Normal file
@ -0,0 +1,24 @@
|
||||
root = true
|
||||
|
||||
[*]
|
||||
indent_style = space
|
||||
indent_size = 4
|
||||
end_of_line = lf
|
||||
charset = utf-8
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = true
|
||||
|
||||
[*.js]
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
|
||||
[{*.html,*.css,*.json}]
|
||||
indent_style = tab
|
||||
indent_size = 4
|
||||
|
||||
[lib/codemirror.css]
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
|
||||
[*.md]
|
||||
trim_trailing_whitespace = false
|
3
README.md
Normal file
3
README.md
Normal file
@ -0,0 +1,3 @@
|
||||
## Text diff online tool
|
||||
|
||||
Originally project by [aTool-org](https://github.com/aTool-org/diff-online).
|
@ -15,10 +15,10 @@ This example demonstrates the minimum amount of code required to use Mergely.
|
||||
<!-- Requires jQuery -->
|
||||
<script src="http://libs.baidu.com/jquery/1.9.0/jquery.min.js" type="text/javascript"></script>
|
||||
<!-- Requires CodeMirror -->
|
||||
<script type="text/javascript" src="./lib/codemirror.js"></script>
|
||||
<script type="text/javascript" src="./lib/codemirror.min.js"></script>
|
||||
<link type="text/css" rel="stylesheet" href="./lib/codemirror.css" />
|
||||
<!-- Requires Mergely -->
|
||||
<script type="text/javascript" src="./lib/mergely.js"></script>
|
||||
<script type="text/javascript" src="./lib/mergely.min.js"></script>
|
||||
<link type="text/css" rel="stylesheet" href="./lib/mergely.css" />
|
||||
</head>
|
||||
<body>
|
||||
|
5384
lib/codemirror.js
5384
lib/codemirror.js
File diff suppressed because it is too large
Load Diff
1576
lib/mergely.js
1576
lib/mergely.js
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user