SJS wrote:
Apparently, mercurial doesn't do merges.
Um, "hg merge"?
http://hgbook.red-bean.com/hgbookch3.html
(I was poking around on the mercurial webpages today and discovered this.)
It foists that task off on to the external program of your choice.
Quoting:
In the recent batteries included installers, gpyfm has been configured
as the default interactive 3-way merge tool. Actually, gpyfm is only
the default because the hgmerge wrapper finds it before kdiff3.
* If the 3-way merge is trivial (does not result in conflicts), then the
interactive merge tool is never launched.
Both of these behaviors are configurable, but they are the defaults.
http://qct.wiki.sourceforge.net/hgmerge
Also note that the November release didn't include kdiff3 (it only had
gpyfm), but it was reintroduced in the December release.
Now, I would like to know if this is different from how git does things.
Does git never launch a visual diff tool?
-a
--
[email protected]
http://www.kernel-panic.org/cgi-bin/mailman/listinfo/kplug-list
