equal
deleted
inserted
replaced
181 fix file1 [MERGE from v1-1] |
181 fix file1 [MERGE from v1-1] |
182 10 changeset entries |
182 10 changeset entries |
183 sorting... |
183 sorting... |
184 converting... |
184 converting... |
185 9 add file1 on trunk |
185 9 add file1 on trunk |
186 8 add text |
186 8 unrelated change |
187 7 unrelated change |
187 7 add text |
188 6 add text [MERGE from v1_0] |
188 6 add text [MERGE from v1_0] |
189 5 add text [MERGE from v1_1] |
189 5 add text [MERGE from v1_1] |
190 4 add file2 on trunk |
190 4 add file2 on trunk |
191 3 add other text |
191 3 add other text |
192 2 add other text [MERGE from HEAD] |
192 2 add other text [MERGE from HEAD] |
202 7: 'v1_1' add other text [MERGE from HEAD] |
202 7: 'v1_1' add other text [MERGE from HEAD] |
203 6: '' add other text |
203 6: '' add other text |
204 5: '' add file2 on trunk |
204 5: '' add file2 on trunk |
205 4: '' add text [MERGE from v1_1] |
205 4: '' add text [MERGE from v1_1] |
206 3: 'v1_1' add text [MERGE from v1_0] |
206 3: 'v1_1' add text [MERGE from v1_0] |
207 2: 'v1_1' unrelated change |
207 2: 'v1_0' add text |
208 1: 'v1_0' add text |
208 1: 'v1_1' unrelated change |
209 0: '' add file1 on trunk |
209 0: '' add file1 on trunk |
210 |
210 |
211 graphical log |
211 graphical log |
212 |
212 |
213 $ hg -R proj.hg glog --template="$template" |
213 $ hg -R proj.hg glog --template="$template" |
223 | | |
223 | | |
224 o | 4: '' add text [MERGE from v1_1] |
224 o | 4: '' add text [MERGE from v1_1] |
225 |\| |
225 |\| |
226 | o 3: 'v1_1' add text [MERGE from v1_0] |
226 | o 3: 'v1_1' add text [MERGE from v1_0] |
227 | |\ |
227 | |\ |
228 +---o 2: 'v1_1' unrelated change |
228 +---o 2: 'v1_0' add text |
229 | | |
229 | | |
230 | o 1: 'v1_0' add text |
230 | o 1: 'v1_1' unrelated change |
231 |/ |
231 |/ |
232 o 0: '' add file1 on trunk |
232 o 0: '' add file1 on trunk |
233 |
233 |