运行 Mac 上两个文件的文件差异

Question

我是比较文件，但我的理解是+表示添加和-符号删除。新文件有错别字：

if (KEY_STATUS.spacr) {

为什么用-表示。应该是+吧？当我运行 diff -u game_new.js game_old.js:

--- game_new.js 2018-06-12 02:03:32.000000000 -0700
+++ game_old.js 2018-06-12 02:03:22.000000000 -0700
@@ -4,9 +4,9 @@
 //

 KEY_CODES = {
-  13: 'enter',
   32: 'space',
   37: 'left',
+  38: 'up',
   39: 'right',
   40: 'down',
   70: 'f',
@@ -392,7 +392,7 @@
       this.vel.rot = 0;
     }

-    if (KEY_STATUS.spacr) {
+    if (KEY_STATUS.up) {
       var rad = ((this.rot-90) * Math.PI)/180;
       this.acc.x = 0.5 * Math.cos(rad);
       this.acc.y = 0.5 * Math.sin(rad);
@@ -406,7 +406,7 @@
     if (this.delayBeforeBullet > 0) {
       this.delayBeforeBullet -= delta;
     }
-    if (KEY_STATUS.enter) {
+    if (KEY_STATUS.space) {
       if (this.delayBeforeBullet <= 0) {
         this.delayBeforeBullet = 10;
         for (var i = 0; i < this.bullets.length; i++) {
@@ -919,7 +919,7 @@
     waiting: function () {
       Text.renderText(ipad ? 'Touch Sreen to Start' : 'Press Space to Start', 36, Game.canvasWidth/2 - 270, Game.canvasHeight/2);
       if (KEY_STATUS.space || window.gameStart) {
-        KEY_STATUS.space = false; // hack so we don't move right away
+        KEY_STATUS.space = false; // hack so we don't shoot right away
         window.gameStart = false;
         this.state = 'start';
       }

Answer 1

我相信当你运行:

diff -u game_new.js game_old.js

来自左侧文件的更改被解释为来源，并标有减号，而来自文件的更改]right被视为目的地，并标有加号。

如果您希望 - 和 + 标签按您的意愿显示，则运行 diff 文件的顺序相反：

diff -u game_old.js game_new.js

运行 Mac 上两个文件的文件差异

running file diff on two files on Mac

diff