Documentation/Source/eric5.UI.DiffDialog.html

changeset 3018
70924c0bdaf1
parent 2966
f85f686981ad
equal deleted inserted replaced
3017:6a8cb7632448 3018:70924c0bdaf1
328 by time.ctime(). If not specified, the strings default to blanks. 328 by time.ctime(). If not specified, the strings default to blanks.
329 </p><p> 329 </p><p>
330 Example: 330 Example:
331 </p><p> 331 </p><p>
332 <pre> 332 <pre>
333 &gt;&gt;&gt; print ''.join(context_diff('one\ntwo\nthree\nfour\n'.splitlines(1), 333 &gt;&gt;&gt; print ''.join(
334 ... context_diff('one\ntwo\nthree\nfour\n'.splitlines(1),
334 ... 'zero\none\ntree\nfour\n'.splitlines(1), 'Original', 'Current', 335 ... 'zero\none\ntree\nfour\n'.splitlines(1), 'Original', 'Current',
335 ... 'Sat Jan 26 23:30:50 1991', 'Fri Jun 06 10:22:46 2003')), 336 ... 'Sat Jan 26 23:30:50 1991', 'Fri Jun 06 10:22:46 2003')),
336 *** Original Sat Jan 26 23:30:50 1991 337 *** Original Sat Jan 26 23:30:50 1991
337 --- Current Fri Jun 06 10:22:46 2003 338 --- Current Fri Jun 06 10:22:46 2003
338 *************** 339 ***************

eric ide

mercurial