tests/test-diff-unified.t
changeset 24496 9a4ef1b18cae
parent 23300 f8b5c3e77d4b
child 29952 e40343ce9c4c
equal deleted inserted replaced
24495:d2a3a2808974 24496:9a4ef1b18cae
   284   +++ b/f1
   284   +++ b/f1
   285   @@ -1,1 +1,1 @@
   285   @@ -1,1 +1,1 @@
   286   -b
   286   -b
   287   +a
   287   +a
   288 
   288 
       
   289 showfunc diff
       
   290   $ cat > f1 << EOF
       
   291   > int main() {
       
   292   >     int a = 0;
       
   293   >     int b = 1;
       
   294   >     int c = 2;
       
   295   >     int d = 3;
       
   296   >     return a + b + c + d;
       
   297   > }
       
   298   > EOF
       
   299   $ hg commit -m addfunction
       
   300   $ cat > f1 << EOF
       
   301   > int main() {
       
   302   >     int a = 0;
       
   303   >     int b = 1;
       
   304   >     int c = 2;
       
   305   >     int e = 3;
       
   306   >     return a + b + c + e;
       
   307   > }
       
   308   > EOF
       
   309   $ hg diff --git
       
   310   diff --git a/f1 b/f1
       
   311   --- a/f1
       
   312   +++ b/f1
       
   313   @@ -2,6 +2,6 @@
       
   314        int a = 0;
       
   315        int b = 1;
       
   316        int c = 2;
       
   317   -    int d = 3;
       
   318   -    return a + b + c + d;
       
   319   +    int e = 3;
       
   320   +    return a + b + c + e;
       
   321    }
       
   322   $ hg diff --config diff.showfunc=True --git
       
   323   diff --git a/f1 b/f1
       
   324   --- a/f1
       
   325   +++ b/f1
       
   326   @@ -2,6 +2,6 @@ int main() {
       
   327        int a = 0;
       
   328        int b = 1;
       
   329        int c = 2;
       
   330   -    int d = 3;
       
   331   -    return a + b + c + d;
       
   332   +    int e = 3;
       
   333   +    return a + b + c + e;
       
   334    }
       
   335 
   289   $ cd ..
   336   $ cd ..