Mercurial > hgbook
comparison en/examples/tour-merge-conflict.merge.out @ 484:0abd3d78172e
finished translation of a figure
translated a few paragraphs of tour-merge
| author | Javier Rojas <jerojasro@devnull.li> |
|---|---|
| date | Sun, 02 Nov 2008 13:54:42 -0500 |
| parents | 83790457e85b |
| children | bc14f94e726a |
comparison
equal
deleted
inserted
replaced
| 483:7f1572c365d2 | 484:0abd3d78172e |
|---|