Thanks dmitri,
To rule out other culprits, ran git diff to ensure the file had no changes, opened the file with PhpED, added the single line at the bottom, clicked the PhpED save button, and ran git diff again, and you will see I have a bunch of changes.
I then discarded the changes, used Notepad+ which is running on Windows to edit the file which is located on Linux and accessible via the same Samba network which PhpED uses, and it didn't add the ^M characters. If not PhpED, what can be doing this?
[Michael@devserver dataloggertester]$ git diff
[Michael@devserver dataloggertester]$ git diff
diff --git a/index.html b/index.html
index 18175e0..839df3e 100755
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
<style type="text/css">
#table-container, #form, #cheat-sheet, #table-sources, #response {
border: 1px solid black;
- padding: 5px;
+ padding: 5px;^M
}
#table-container {
height:500px;
@@ -22,18 +22,18 @@
min-height: 0px;
}
- #table-container tr td:first-child {
+ #table-container tr td:first-child {^M
width: 16px;padding:8px;
}
- #table-container tr.c2s td:first-child {
+ #table-container tr.c2s td:first-child {^M
background-image: url("resources/left.png");
background-repeat: no-repeat;
}
- #table-container tr.s2c td:first-child {
+ #table-container tr.s2c td:first-child {^M
background-image: url("resources/right.png");
background-repeat: no-repeat;
}
- #table-container tr.error td:first-child {
+ #table-container tr.error td:first-child {^M
background-image: url("resources/error.png");
background-repeat: no-repeat;
}
@@ -74,7 +74,7 @@
#response {
height: 50px;
}
- </style>
+ </style>^M
<script type="text/javascript">
$(function(){
function setPosition() {
@@ -121,7 +121,7 @@
else {
clearInterval(timer);
$('#update').prop('disabled', false);
- }
+ }^M
});
$('#command').change(function() {
switch($(this).val()) {
@@ -226,3 +226,4 @@
}?></div>
</body>
</html>
+Test PhpED
\ No newline at end of file
[Michael@devserver dataloggertester]$
|