lxm_front/Mergely
1
0
Fork 1
mirror of https://github.com/wickedest/Mergely.git synced 2026-03-20 09:38:39 +08:00
Code Issues Projects Releases Wiki Activity

Mergely 3.0 that works with CodeMirror 3.0 beta.

Browse Source
This commit is contained in:
Jamie Peabody
2012-11-03 18:17:49 +00:00
parent b5e669d330
commit 5b390c6737
27 changed files with 9340 additions and 1630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/example1.html
View File

@@ -1,10 +1,11 @@
<!--
This example demonstrates the minimum amount of code required to use Mergely.
-->
<!DOCTYPE HTML>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" /><title>Mergely - Simple Example</title>
<meta http-equiv="X-UA-Compatible" content="chrome=1, IE=edge">
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
<meta name="description" content="Merge and Diff your documents with diff online and share" />
<meta name="keywords" content="diff,merge,compare,jsdiff,comparison,difference,file,text,unix,patch,algorithm,saas,longest common subsequence" />
@@ -16,7 +17,7 @@ This example demonstrates the minimum amount of code required to use Mergely.
<script src="jquery.corner.js" type="text/javascript"></script>
<!-- Requires CodeMirror 2.16 -->
<script type="text/javascript" src="../lib/codemirror.min.js"></script>
<script type="text/javascript" src="../lib/codemirror.js"></script>
<link type="text/css" rel="stylesheet" href="../lib/codemirror.css" />
<!-- Requires Mergely -->