3068 ! . |
3068 ! . |
3069 o ! changeset: 31:621d83e11f67 |
3069 o ! changeset: 31:621d83e11f67 |
3070 !\! parent: 21:d42a756af44d |
3070 !\! parent: 21:d42a756af44d |
3071 ! ! parent: 30:6e11cd4b648f |
3071 ! ! parent: 30:6e11cd4b648f |
3072 ! ! user: test |
3072 ! ! user: test |
3073 ! . date: Thu Jan 01 00:00:31 1970 +0000 |
3073 ! ! date: Thu Jan 01 00:00:31 1970 +0000 |
3074 ! . summary: (31) expand |
3074 ! ! summary: (31) expand |
3075 ! . |
3075 ! ! |
3076 o ! changeset: 30:6e11cd4b648f |
3076 o ! changeset: 30:6e11cd4b648f |
3077 !\ \ parent: 28:44ecd0b9ae99 |
3077 !\ \ parent: 28:44ecd0b9ae99 |
3078 ! ~ ! parent: 29:cd9bb2be7593 |
3078 ! ~ ! parent: 29:cd9bb2be7593 |
3079 ! ! user: test |
3079 ! ! user: test |
3080 ! . date: Thu Jan 01 00:00:30 1970 +0000 |
3080 ! ! date: Thu Jan 01 00:00:30 1970 +0000 |
3081 ! . summary: (30) expand |
3081 ! ! summary: (30) expand |
3082 ! / |
3082 ! / |
3083 o ! changeset: 28:44ecd0b9ae99 |
3083 o ! changeset: 28:44ecd0b9ae99 |
3084 !\ \ parent: 1:6db2ef61d156 |
3084 !\ \ parent: 1:6db2ef61d156 |
3085 ! ~ ! parent: 26:7f25b6c2f0b9 |
3085 ! ~ ! parent: 26:7f25b6c2f0b9 |
3086 ! ! user: test |
3086 ! ! user: test |
3087 ! . date: Thu Jan 01 00:00:28 1970 +0000 |
3087 ! ! date: Thu Jan 01 00:00:28 1970 +0000 |
3088 ! . summary: (28) merge zero known |
3088 ! ! summary: (28) merge zero known |
3089 ! / |
3089 ! / |
3090 o ! changeset: 26:7f25b6c2f0b9 |
3090 o ! changeset: 26:7f25b6c2f0b9 |
3091 !\ \ parent: 18:1aa84d96232a |
3091 !\ \ parent: 18:1aa84d96232a |
3092 ! ! ! parent: 25:91da8ed57247 |
3092 ! ! ! parent: 25:91da8ed57247 |
3093 ! ! ! user: test |
3093 ! ! ! user: test |
3094 ! ! . date: Thu Jan 01 00:00:26 1970 +0000 |
3094 ! ! ! date: Thu Jan 01 00:00:26 1970 +0000 |
3095 ! ! . summary: (26) merge one known; far right |
3095 ! ! ! summary: (26) merge one known; far right |
3096 ! ! . |
3096 ! ! ! |
3097 ! o ! changeset: 25:91da8ed57247 |
3097 ! o ! changeset: 25:91da8ed57247 |
3098 ! !\! parent: 21:d42a756af44d |
3098 ! !\! parent: 21:d42a756af44d |
3099 ! ! ! parent: 24:a9c19a3d96b7 |
3099 ! ! ! parent: 24:a9c19a3d96b7 |
3100 ! ! ! user: test |
3100 ! ! ! user: test |
3101 ! ! . date: Thu Jan 01 00:00:25 1970 +0000 |
3101 ! ! ! date: Thu Jan 01 00:00:25 1970 +0000 |
3102 ! ! . summary: (25) merge one known; far left |
3102 ! ! ! summary: (25) merge one known; far left |
3103 ! ! . |
3103 ! ! ! |
3104 ! o ! changeset: 24:a9c19a3d96b7 |
3104 ! o ! changeset: 24:a9c19a3d96b7 |
3105 ! !\ \ parent: 0:e6eb3150255d |
3105 ! !\ \ parent: 0:e6eb3150255d |
3106 ! ! ~ ! parent: 23:a01cddf0766d |
3106 ! ! ~ ! parent: 23:a01cddf0766d |
3107 ! ! ! user: test |
3107 ! ! ! user: test |
3108 ! ! . date: Thu Jan 01 00:00:24 1970 +0000 |
3108 ! ! ! date: Thu Jan 01 00:00:24 1970 +0000 |
3109 ! ! . summary: (24) merge one known; immediate right |
3109 ! ! ! summary: (24) merge one known; immediate right |
3110 ! ! / |
3110 ! ! / |
3111 ! o ! changeset: 23:a01cddf0766d |
3111 ! o ! changeset: 23:a01cddf0766d |
3112 ! !\ \ parent: 1:6db2ef61d156 |
3112 ! !\ \ parent: 1:6db2ef61d156 |
3113 ! ! ~ ! parent: 22:e0d9cccacb5d |
3113 ! ! ~ ! parent: 22:e0d9cccacb5d |
3114 ! ! ! user: test |
3114 ! ! ! user: test |
3115 ! ! . date: Thu Jan 01 00:00:23 1970 +0000 |
3115 ! ! ! date: Thu Jan 01 00:00:23 1970 +0000 |
3116 ! ! . summary: (23) merge one known; immediate left |
3116 ! ! ! summary: (23) merge one known; immediate left |
3117 ! ! / |
3117 ! ! / |
3118 ! o ! changeset: 22:e0d9cccacb5d |
3118 ! o ! changeset: 22:e0d9cccacb5d |
3119 !/!/ parent: 18:1aa84d96232a |
3119 !/!/ parent: 18:1aa84d96232a |
3120 ! ! parent: 21:d42a756af44d |
3120 ! ! parent: 21:d42a756af44d |
3121 ! ! user: test |
3121 ! ! user: test |
3122 ! . date: Thu Jan 01 00:00:22 1970 +0000 |
3122 ! ! date: Thu Jan 01 00:00:22 1970 +0000 |
3123 ! . summary: (22) merge two known; one far left, one far right |
3123 ! ! summary: (22) merge two known; one far left, one far right |
3124 ! . |
3124 ! ! |
3125 ! o changeset: 21:d42a756af44d |
3125 ! o changeset: 21:d42a756af44d |
3126 ! !\ parent: 19:31ddc2c1573b |
3126 ! !\ parent: 19:31ddc2c1573b |
3127 ! ! ! parent: 20:d30ed6450e32 |
3127 ! ! ! parent: 20:d30ed6450e32 |
3128 ! ! ! user: test |
3128 ! ! ! user: test |
3129 ! ! ! date: Thu Jan 01 00:00:21 1970 +0000 |
3129 ! ! ! date: Thu Jan 01 00:00:21 1970 +0000 |
3176 ! . summary: (32) expand |
3176 ! . summary: (32) expand |
3177 ! . |
3177 ! . |
3178 o ! changeset: 31:621d83e11f67 |
3178 o ! changeset: 31:621d83e11f67 |
3179 !\! parent: 21:d42a756af44d |
3179 !\! parent: 21:d42a756af44d |
3180 ! ! parent: 30:6e11cd4b648f |
3180 ! ! parent: 30:6e11cd4b648f |
3181 ! . user: test |
3181 ! ! user: test |
3182 ! . date: Thu Jan 01 00:00:31 1970 +0000 |
3182 ! ! date: Thu Jan 01 00:00:31 1970 +0000 |
3183 ! . summary: (31) expand |
3183 ! ! summary: (31) expand |
3184 ! . |
3184 ! ! |
3185 o ! changeset: 30:6e11cd4b648f |
3185 o ! changeset: 30:6e11cd4b648f |
3186 !\ \ parent: 28:44ecd0b9ae99 |
3186 !\ \ parent: 28:44ecd0b9ae99 |
3187 ! ~ ! parent: 29:cd9bb2be7593 |
3187 ! ~ ! parent: 29:cd9bb2be7593 |
3188 ! . user: test |
3188 ! ! user: test |
3189 ! . date: Thu Jan 01 00:00:30 1970 +0000 |
3189 ! ! date: Thu Jan 01 00:00:30 1970 +0000 |
3190 ! . summary: (30) expand |
3190 ! ! summary: (30) expand |
3191 ! / |
3191 ! / |
3192 o ! changeset: 28:44ecd0b9ae99 |
3192 o ! changeset: 28:44ecd0b9ae99 |
3193 !\ \ parent: 1:6db2ef61d156 |
3193 !\ \ parent: 1:6db2ef61d156 |
3194 ! ~ ! parent: 26:7f25b6c2f0b9 |
3194 ! ~ ! parent: 26:7f25b6c2f0b9 |
3195 ! . user: test |
3195 ! ! user: test |
3196 ! . date: Thu Jan 01 00:00:28 1970 +0000 |
3196 ! ! date: Thu Jan 01 00:00:28 1970 +0000 |
3197 ! . summary: (28) merge zero known |
3197 ! ! summary: (28) merge zero known |
3198 ! / |
3198 ! / |
3199 o ! changeset: 26:7f25b6c2f0b9 |
3199 o ! changeset: 26:7f25b6c2f0b9 |
3200 !\ \ parent: 18:1aa84d96232a |
3200 !\ \ parent: 18:1aa84d96232a |
3201 ! ! ! parent: 25:91da8ed57247 |
3201 ! ! ! parent: 25:91da8ed57247 |
3202 ! ! . user: test |
3202 ! ! ! user: test |
3203 ! ! . date: Thu Jan 01 00:00:26 1970 +0000 |
3203 ! ! ! date: Thu Jan 01 00:00:26 1970 +0000 |
3204 ! ! . summary: (26) merge one known; far right |
3204 ! ! ! summary: (26) merge one known; far right |
3205 ! ! . |
3205 ! ! ! |
3206 ! o ! changeset: 25:91da8ed57247 |
3206 ! o ! changeset: 25:91da8ed57247 |
3207 ! !\! parent: 21:d42a756af44d |
3207 ! !\! parent: 21:d42a756af44d |
3208 ! ! ! parent: 24:a9c19a3d96b7 |
3208 ! ! ! parent: 24:a9c19a3d96b7 |
3209 ! ! . user: test |
3209 ! ! ! user: test |
3210 ! ! . date: Thu Jan 01 00:00:25 1970 +0000 |
3210 ! ! ! date: Thu Jan 01 00:00:25 1970 +0000 |
3211 ! ! . summary: (25) merge one known; far left |
3211 ! ! ! summary: (25) merge one known; far left |
3212 ! ! . |
3212 ! ! ! |
3213 ! o ! changeset: 24:a9c19a3d96b7 |
3213 ! o ! changeset: 24:a9c19a3d96b7 |
3214 ! !\ \ parent: 0:e6eb3150255d |
3214 ! !\ \ parent: 0:e6eb3150255d |
3215 ! ! ~ ! parent: 23:a01cddf0766d |
3215 ! ! ~ ! parent: 23:a01cddf0766d |
3216 ! ! . user: test |
3216 ! ! ! user: test |
3217 ! ! . date: Thu Jan 01 00:00:24 1970 +0000 |
3217 ! ! ! date: Thu Jan 01 00:00:24 1970 +0000 |
3218 ! ! . summary: (24) merge one known; immediate right |
3218 ! ! ! summary: (24) merge one known; immediate right |
3219 ! ! / |
3219 ! ! / |
3220 ! o ! changeset: 23:a01cddf0766d |
3220 ! o ! changeset: 23:a01cddf0766d |
3221 ! !\ \ parent: 1:6db2ef61d156 |
3221 ! !\ \ parent: 1:6db2ef61d156 |
3222 ! ! ~ ! parent: 22:e0d9cccacb5d |
3222 ! ! ~ ! parent: 22:e0d9cccacb5d |
3223 ! ! . user: test |
3223 ! ! ! user: test |
3224 ! ! . date: Thu Jan 01 00:00:23 1970 +0000 |
3224 ! ! ! date: Thu Jan 01 00:00:23 1970 +0000 |
3225 ! ! . summary: (23) merge one known; immediate left |
3225 ! ! ! summary: (23) merge one known; immediate left |
3226 ! ! / |
3226 ! ! / |
3227 ! o ! changeset: 22:e0d9cccacb5d |
3227 ! o ! changeset: 22:e0d9cccacb5d |
3228 !/!/ parent: 18:1aa84d96232a |
3228 !/!/ parent: 18:1aa84d96232a |
3229 ! ! parent: 21:d42a756af44d |
3229 ! ! parent: 21:d42a756af44d |
3230 ! . user: test |
3230 ! ! user: test |
3231 ! . date: Thu Jan 01 00:00:22 1970 +0000 |
3231 ! ! date: Thu Jan 01 00:00:22 1970 +0000 |
3232 ! . summary: (22) merge two known; one far left, one far right |
3232 ! ! summary: (22) merge two known; one far left, one far right |
3233 ! . |
3233 ! ! |
3234 ! o changeset: 21:d42a756af44d |
3234 ! o changeset: 21:d42a756af44d |
3235 ! !\ parent: 19:31ddc2c1573b |
3235 ! !\ parent: 19:31ddc2c1573b |
3236 ! ! ! parent: 20:d30ed6450e32 |
3236 ! ! ! parent: 20:d30ed6450e32 |
3237 ! ! ! user: test |
3237 ! ! ! user: test |
3238 ! ! ! date: Thu Jan 01 00:00:21 1970 +0000 |
3238 ! ! ! date: Thu Jan 01 00:00:21 1970 +0000 |