How to configure Mercurial to use Kompare when merging?

Posted by obvio171 on Stack Overflow See other posts from Stack Overflow or by obvio171
Published on 2010-04-20T11:21:07Z Indexed on 2010/04/20 11:23 UTC
Read the original article Hit count: 426

Filed under:

kompare

|

diff

|

merge

|

mercurial

I've tried adding merge=kompare to my ~/.hgrc, but when I run hg merge, it runs kompare, but there's no UI to be seen. Hg says merging path/to/first-file and stays there, actionless.

Related posts about diff

newline-ignoring diff / diff across multiple lines / reflow-ignoring diff

as seen on Stack Overflow - Search for 'Stack Overflow'
Does anybody know of a diff-like tool that can show me the changes between two text files, but ignore changes in whitespace including newlines? Here's an example: the quick brown fox jumped over the lazy bear. the quick brown fox jumped over the lazy bear. the quick brown fox jumped over the… >>> More
Unix diff to only print relevant diff

as seen on Stack Overflow - Search for 'Stack Overflow'
I have these two files File:11 11 12345 File:22 123 456 Output of diff 11 22 2c2 < 456123 --- > 789 Output to be < 456123 > 789 I want it to not print 2c2 and "--" line. I looked at the man page but could not locate any help. Any ideas? The file has more than 1K lines >>> More
How to make meld prefer an SVN diff over a CVS diff

as seen on Stack Overflow - Search for 'Stack Overflow'
We have some directories that are tracked in both CVS and SVN (loooong story). When I change a file in one of these and run meld it diffs it against the SVN version. However for some of the other developers it diffs against CVS. Is there a way to specify which one gets priority? Everyone is using… >>> More
Is there a JS diff library against htmlstring just like google-diff-match-patch on plain text?

as seen on Stack Overflow - Search for 'Stack Overflow'
Currently I am using google-diff-match-patch to implement a real-time editing tool, which can synchronize texts between multiple users. Everything works great when operations are only plain texts, each user's operation(add/delete texts) could be diff-ed out by comparing to old text snapshot with the… >>> More
Paragraph-based diff program?

as seen on Stack Overflow - Search for 'Stack Overflow'
Does anyone know of a diff viewer or comparison program that can do paragraph-based differentials? My repos has a large number of LaTeX files that are formatted into 80-character wide paragraphs (for easy editing with vim). It's currently very difficult to interpret the diffs between various versions… >>> More

Developer IT

How to configure Mercurial to use Kompare when merging? - Developer IT

How to configure Mercurial to use Kompare when merging?

kompare

diff

merge

mercurial

Related posts about kompare

How to configure Mercurial to use Kompare when merging?

Best Diff Tool?

Textually diffing JSON

Related posts about diff

newline-ignoring diff / diff across multiple lines / reflow-ignoring diff

Unix diff to only print relevant diff

How to make meld prefer an SVN diff over a CVS diff

Is there a JS diff library against htmlstring just like google-diff-match-patch on plain text?

Paragraph-based diff program?

Categories cloud