kdiff3-user — User questions about KDiff3.

[Kdiff3-user] Re: kdiff3

[Joachim E. <joa...@gm...>]

On Thursday 04 March 2004 01:00, robert.kluver@xxx wrote:
> Hi Joachim,
>
> Thanks for providing such a great and full-featured merge tool. It works
> well!
>
> I couple of suggestions if you like: ability to ignore space/tab
> differences when diffing files. 

If you mean to suppress the visibility of space/tab differences, disable "Show 
White Space" in the "Merge"-Menu.

> And also ability to automatically select 
> the difference from the most recent file if merging. I.e. a one-click merge
> (useful if merging files from two directories when some files have changed
> in one dir and some in the other!). For example clicking this "auto merge"
> (or whatever you want to call it) button would automatically select the
> changes from teh most recent file and show them in the output pane. Of
> course, if the two files being compared have both changed since the
> original, then this would not be a usable option. But would work well if
> you are synching source directories between a laptop and a dev machine.
>
> Regards,
>
> Rob

For directory-synching there exist two options to help you in the 
Configure-dialog under "Directory Merge":
- "Copy newer files instead of merging" (When comparing a directory the 
default choice for the destination is the newer file.)
- "Synchronize directories": No separate destination directory needed. 
Depending on the merge operation, writing will be done into either 
source-directory or both.

Cheers,
Joachim

[Kdiff3-user] German Advertising Media + Translations

[peter e. <ehr...@d-...>]

Hello:

How about perfect translations from English into German?
-----------------------------------------------------------------------------=
------------
Real Advertising Text, 1:1-Translations, tec translation, for brochures, ads =
or whatever?
You need to redesign and to translate English  internet pages into German?
-----------------------------------------------------------------------------=
----------------------------------------
Manual submission to German seaching machines?
Text and Keyword optimising?
Better search results because using a German domain (*.de)?

I take care of a few serious clients which are in demand for quality =
services.
My topic was  "hard- and software", but with my background it's simple for me =
to design text and graphics for all purposes.

 If you are in the market for a German marketing partner and your =
organisation is used to work with self-organized, competent individuals on a =
high management level, I would be glad if you contact me.

Kind regards

Peter Ehrenberg
ehr...@d-...
  

[Kdiff3-user] Re: Building Kdiff3 on Unix with QT libs

[Joachim E. <joa...@gm...>]

Hi Steven,

If you want to use other compilers than gcc you should try to create your own 
Makefile with qmake.
- Enter the src-directory, 
- set the QTDIR-environment-variable, 
- call "$QTDIR/bin/qmake kdiff3.pro", which creates a "Makefile". 
- Now call make (or gmake).

BTW: On my system map is located at "/usr/include/g++/map".

Drop me a line, if this helped you.
Cheers,
Joachim


On Wednesday 18 February 2004 09:02, you wrote:
> I am very interested in using Kdiff3. I have been looking for something
> that does 3-way merging on both Windows and Unix - and that does it well.
> Kdiff3 seems to do very well on Windows and Solaris. Unfortunately, I have
> not been able to build it on HP-UX (hppa2.0w-hp-hpux11.00). Has anyone
> built it there with just the qt libs and without KDE? The README says that
> g++ is required but in fact I don't believe g++ will build it. For one
> thing some include files ("map" for example) are not anywhere in gcc. On
> Solaris I eventually built it using the native compiler. On HP I have not
> been able to build it yet using the native aCC compiler. Has anyone done
> so? Can you tell me what compile and link switches I need to use? Or can
> you refer me to someone who can tell me?
>
> Thank you (and congratulations on the good job you've done),