tests/test-diff-unified.t
changeset 29948 e40343ce9c4c
parent 24496 9a4ef1b18cae
child 30807 6381a6dbc325
equal deleted inserted replaced
29947:e1f0ec0b7d2d 29948:e40343ce9c4c
   331   -    return a + b + c + d;
   331   -    return a + b + c + d;
   332   +    int e = 3;
   332   +    int e = 3;
   333   +    return a + b + c + e;
   333   +    return a + b + c + e;
   334    }
   334    }
   335 
   335 
       
   336 If [diff] git is set to true, but the user says --no-git, we should
       
   337 *not* get git diffs
       
   338   $ hg diff --nodates --config diff.git=1 --no-git
       
   339   diff -r f2c7c817fa55 f1
       
   340   --- a/f1
       
   341   +++ b/f1
       
   342   @@ -2,6 +2,6 @@
       
   343        int a = 0;
       
   344        int b = 1;
       
   345        int c = 2;
       
   346   -    int d = 3;
       
   347   -    return a + b + c + d;
       
   348   +    int e = 3;
       
   349   +    return a + b + c + e;
       
   350    }
       
   351 
   336   $ cd ..
   352   $ cd ..