tests/test-narrow-shallow-merges.t
branchstable
changeset 47504 411dc27fd9fd
parent 46779 49fd21f32695
child 49012 5b65721a75eb
equal deleted inserted replaced
47503:bd0a2a919bf8 47504:411dc27fd9fd
   177   |
   177   |
   178   o  0 b844052e7b3b... outside 2c
   178   o  0 b844052e7b3b... outside 2c
   179   
   179   
   180 
   180 
   181   $ hg log -T '{if(ellipsis,"...")}{node|short} {p1node|short} {p2node|short} {desc}\n' | sort
   181   $ hg log -T '{if(ellipsis,"...")}{node|short} {p1node|short} {p2node|short} {desc}\n' | sort
   182   ...2a20009de83e 3ac1f5779de3 000000000000 outside 10
   182   ...2a20009de83e 000000000000 3ac1f5779de3 outside 10
   183   ...3ac1f5779de3 bb96a08b062a 465567bdfb2d merge a/b/c/d 9
   183   ...3ac1f5779de3 bb96a08b062a 465567bdfb2d merge a/b/c/d 9
   184   ...8d874d57adea 7ef88b4dd4fa 000000000000 outside 12
   184   ...8d874d57adea 7ef88b4dd4fa 000000000000 outside 12
   185   ...b844052e7b3b 000000000000 000000000000 outside 2c
   185   ...b844052e7b3b 000000000000 000000000000 outside 2c
   186   ...d1c61993ec83 000000000000 000000000000 outside 2d
   186   ...d1c61993ec83 000000000000 000000000000 outside 2d
   187   465567bdfb2d d1c61993ec83 000000000000 inside 3
   187   465567bdfb2d d1c61993ec83 000000000000 inside 3