Mercurial > hgbook

comparison en/ch02-tour-merge.xml @ 754:65e9a18d2c7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Shrink large images to fit page
author Dongsheng Song <dongsheng.song@gmail.com>
date Mon, 30 Mar 2009 17:36:57 +0800
parents 1c13ed2130a7
children e9ef075327c1
comparison
equal deleted inserted replaced
753:1c13ed2130a7 754:65e9a18d2c7e
247 <figure id="fig:tour-merge:kdiff3"> 247 <figure id="fig:tour-merge:kdiff3">
248 <title>Using <command>kdiff3</command> to merge versions of a 248 <title>Using <command>kdiff3</command> to merge versions of a
249 file</title> 249 file</title>
250 <mediaobject> 250 <mediaobject>
251 <imageobject> 251 <imageobject>
252 <imagedata imagedata width="100%" fileref="figs/kdiff3.png"/></imageobject> 252 <imagedata width="100%" fileref="figs/kdiff3.png"/></imageobject>
253 <textobject> 253 <textobject>
254 <phrase>XXX add text</phrase> 254 <phrase>XXX add text</phrase>
255 </textobject> 255 </textobject>
256 </mediaobject> 256 </mediaobject>
257 </figure> 257 </figure>