equal
deleted
inserted
replaced
46 s2: Added c and d |
46 s2: Added c and d |
47 s1: Added a and b |
47 s1: Added a and b |
48 s0^ Added foo (base) |
48 s0^ Added foo (base) |
49 $ hg prev |
49 $ hg prev |
50 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
50 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
51 [2] Added c and d |
51 [s2] Added c and d |
52 |
52 |
53 $ echo 0 > num |
53 $ echo 0 > num |
54 $ cat > editor.sh << '__EOF__' |
54 $ cat > editor.sh << '__EOF__' |
55 > NUM=$(cat num) |
55 > NUM=$(cat num) |
56 > NUM=`expr "$NUM" + 1` |
56 > NUM=`expr "$NUM" + 1` |
101 o 002b (foo) Added a and b |
101 o 002b (foo) Added a and b |
102 o f360 Added foo |
102 o f360 Added foo |
103 |
103 |
104 $ hg prev |
104 $ hg prev |
105 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
105 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
106 [4] split1 |
106 [s2] split1 |
107 $ echo foo > c |
107 $ echo foo > c |
108 $ hg diff |
108 $ hg diff |
109 diff -r f26c1b9addde c |
109 diff -r f26c1b9addde c |
110 --- a/c Thu Jan 01 00:00:00 1970 +0000 |
110 --- a/c Thu Jan 01 00:00:00 1970 +0000 |
111 +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
111 +++ b/c Thu Jan 01 00:00:00 1970 +0000 |