Show More
@@ -7,11 +7,7 b' hg init a' | |||||
7 | cd a |
|
7 | cd a | |
8 | echo a > a |
|
8 | echo a > a | |
9 | hg add |
|
9 | hg add | |
10 | diff -N /dev/null /dev/null 2> /dev/null |
|
10 | hg extdiff -o -r $opt | |
11 | if [ $? -ne 0 ]; then |
|
|||
12 | opt="-p gdiff" |
|
|||
13 | fi |
|
|||
14 | hg extdiff -o -Nr $opt |
|
|||
15 |
|
11 | |||
16 | echo "[extdiff]" >> $HGRCPATH |
|
12 | echo "[extdiff]" >> $HGRCPATH | |
17 | echo "cmd.falabala=echo" >> $HGRCPATH |
|
13 | echo "cmd.falabala=echo" >> $HGRCPATH |
@@ -1,9 +1,7 b'' | |||||
1 | adding a |
|
1 | adding a | |
2 | making snapshot of 0 files from rev 000000000000 |
|
2 | making snapshot of 0 files from rev 000000000000 | |
3 | making snapshot of 1 files from working dir |
|
3 | making snapshot of 1 files from working dir | |
4 | diff -Nr a.000000000000/a a/a |
|
4 | Only in a: a | |
5 | 0a1 |
|
|||
6 | > a |
|
|||
7 | making snapshot of 0 files from rev 000000000000 |
|
5 | making snapshot of 0 files from rev 000000000000 | |
8 | making snapshot of 1 files from working dir |
|
6 | making snapshot of 1 files from working dir | |
9 | diffing a.000000000000 a |
|
7 | diffing a.000000000000 a |
General Comments 0
You need to be logged in to leave comments.
Login now