Fixed a bug that would charge 2x customsFee.

[kannonboy]

No description provided.

[cyrusdavid]

How come when I check it in the command line neither bitbucket nor github shows the same:

diff --git a/airfare.js b/airfare.js
index 22d7b01..3f1c970 100644
--- a/airfare.js
+++ b/airfare.js
@@ -5,8 +5,8 @@ var federalTransportTax = .025;

 function calculateAirfare(baseFare) {
     var fare = baseFare;                
-    fare += customsFee; // Fixed it! Phew. Glad we didn't ship that! - Alice
     fare += immigrationFee;
+    fare += customsFee; // Fixed it! Gee, lucky I caught that one. - Bob
     fare *= (1 + federalTransportTax);
     return fare;
 }

Am I using the wrong command? ✨

$ g diff master..bob/master

Edit: oh, triple dot.

[kannonboy]

@vohof you can get output similar to GitHub with

$ git diff master...bob/master
diff --git a/airfare.js b/airfare.js
index 2f6a580..3f1c970 100644
--- a/airfare.js
+++ b/airfare.js
@@ -6,6 +6,7 @@ var federalTransportTax = .025;
 function calculateAirfare(baseFare) {
     var fare = baseFare;                
     fare += immigrationFee;
+    fare += customsFee; // Fixed it! Gee, lucky I caught that one. - Bob
     fare *= (1 + federalTransportTax);
     return fare;
 }

Bitbucket is a little trickier:

$ git checkout --detach master
HEAD is now at d50299d... Merge pull request #1 from kannonboy/alice/master

$ git merge bob/master -m "merge commit for PR diff"
Auto-merging airfare.js
Merge made by the 'recursive' strategy.
 airfare.js | 1 +
 1 file changed, 1 insertion(+)

$ git diff master
diff --git a/airfare.js b/airfare.js
index 22d7b01..8e1b402 100644
--- a/airfare.js
+++ b/airfare.js
@@ -7,6 +7,7 @@ function calculateAirfare(baseFare) {
     var fare = baseFare;                
     fare += customsFee; // Fixed it! Phew. Glad we didn't ship that! - Alice
     fare += immigrationFee;
+    fare += customsFee; // Fixed it! Gee, lucky I caught that one. - Bob
     fare *= (1 + federalTransportTax);
     return fare;
 }