lxm_front/Mergely
1
0
Fork 1
mirror of https://github.com/wickedest/Mergely.git synced 2026-04-01 10:18:36 +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

34
test/index.html Executable file
View File

@@ -0,0 +1,34 @@
<!doctype html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Tests</title>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script type="text/javascript" src="../lib/codemirror.js"></script>
<script type="text/javascript" src="../lib/mergely.js"></script>
<script type="text/javascript" src="lib/jsunit/jsunit.js"></script>
<script type="text/javascript" src="lib/jsunit/stacktrace.js"></script>
<script type="text/javascript" src="lib/jsunit/tipTip.js"></script>
<script type="text/javascript" src="tests.js"></script>
<script type="text/javascript" src="macbeth.js"></script>
<link type="text/css" rel="stylesheet" href="../lib/codemirror.css" />
<link type="text/css" rel="stylesheet" href="../lib/mergely.css" />
<link rel="stylesheet" href="lib/jsunit/jsunit.css">
<link rel="stylesheet" href="lib/jsunit/tipTip.css">
</head>
<body>
<table id="tests">
<tr>
<th>Module</th>
<th>Test Name</th>
<th>State</th>
<th>Retry</th>
<th>Stack</th>
</tr>
</table>
</body>
</html>