code_junkie

Add both sides of diff to merge

Nov 13th, 2011
158
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.38 KB | None | 0 0
  1. 1 <node id="1" />
  2. 2 <node id="2a">
  3. 3 <content item="1"/>
  4. 4 <content item="2a"/>
  5. 5 </node>
  6. 6 <node id="3" />
  7.  
  8. 1 <node id="1" />
  9. 2 <node id="2b">
  10. 3 <content item="1"/>
  11. 4 <content item="2b"/>
  12. 5 </node>
  13. 6 <node id="3" />
  14.  
  15. 1 <node id="1" />
  16. 2 <node id="2a">
  17. 2 <node id="2b">
  18. 3 <content item="1"/>
  19. 4 <content item="2a"/>
  20. 4 <content item="2b"/>
  21. 5 </node>
  22. 6 <node id="3" />
Add Comment
Please, Sign In to add comment