equal
deleted
inserted
replaced
32 (branch merge, don't forget to commit) |
32 (branch merge, don't forget to commit) |
33 diffing a.2a13a4d2da36/a [tmp]/test-extdiff/a/a |
33 diffing a.2a13a4d2da36/a [tmp]/test-extdiff/a/a |
34 diffing a.8a5febb7f867/a a.34eed99112ab/a |
34 diffing a.8a5febb7f867/a a.34eed99112ab/a |
35 diffing a.2a13a4d2da36/a a.46c0e4daeb72/a |
35 diffing a.2a13a4d2da36/a a.46c0e4daeb72/a |
36 diff-like tools yield a non-zero exit code |
36 diff-like tools yield a non-zero exit code |
|
37 |
|
38 % test extdiff of multiple files in tmp dir: |
|
39 % diff in working directory, before |
|
40 diff --git a/a b/a |
|
41 --- a/a |
|
42 +++ b/a |
|
43 @@ -1,1 +1,1 @@ |
|
44 -a |
|
45 +changed |
|
46 diff --git a/b b/b |
|
47 old mode 100644 |
|
48 new mode 100755 |
|
49 --- a/b |
|
50 +++ b/b |
|
51 @@ -1,1 +1,1 @@ |
|
52 -b |
|
53 +changed |
|
54 % edit with extdiff -p |
|
55 % diff in working directory, after |
|
56 diff --git a/a b/a |
|
57 --- a/a |
|
58 +++ b/a |
|
59 @@ -1,1 +1,2 @@ |
|
60 -a |
|
61 +changed |
|
62 +edited |
|
63 diff --git a/b b/b |
|
64 old mode 100644 |
|
65 new mode 100755 |
|
66 --- a/b |
|
67 +++ b/b |
|
68 @@ -1,1 +1,2 @@ |
|
69 -b |
|
70 +changed |
|
71 +edited |