[Kdiff3-user] (no subject)

[owzar001 <owz...@du...>]

Hi.

I am relatively new user of kdiff3. I have found to be very useful
in conjunction with mercurial.

I would like to pose a potentially trivial question on merging
multiple changes within a single line using the following toy example.

Suppose that an author provides the following document for
review 
foo@kolmogorov:/tmp$ cat author/foo.tex
This is a simple randomm sample.

A co-author proceeds by editing the file by correcting the typo and
by deleting the word "simple"

foo@kolmogorov:/tmp$ cat coauthor/foo.tex
This is a random sample.

It is possible fo author to use kdiff3 to accept the typo but
not the deletion of "simple" to get

foo@kolmogorov:/tmp$ cat author/foo.tex
This is a simple random sample.

I am using kdiff3 0.9.92 on Debian Lenny AMD64.

Sincerely,

Kouros

foo@kolmogorov:/tmp$ apt-cache policy kdiff3
kdiff3:
   Installed: 0.9.92-2
   Candidate: 0.9.92-2
   Version table:
  *** 0.9.92-2 0
         650 http://ftp.us.debian.org lenny/main Packages
         100 /var/lib/dpkg/status