History sensitive merging
pmezard at gmail.com
Wed Dec 12 07:43:26 CST 2007
Neal Becker a écrit :
> I just did a merge using kdiff3. First I tried a simple merge without
> history, which is what hg will do. This is:
Do you mean a merge driven by the "merge" command ? "merge" already performs 3-way merges. Take a look at http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram.
In short, it says:
If you have a preferred merge program, you can set the merge entry in the ui section of your hgrc file.
merge = your-merge-program
Note that the order of the argument can differ between hg and your merge program, hgmerge is called
$ hgmerge local base other
The files have to be merged into local.
For example kdiff3 is called
$ kdiff3 base local other -o output
Does it helps ? If so, where did you expect to find such information ?
More information about the Mercurial-devel