diff

I want to be able to do a 3-way merge of XHTML documents: Start with some original copy of the document One user edits a copy of the original document Another user edits a separate copy of the original document Need a tool to merge (automatically and/or visually) the changes made by the two users. Note: I want to include this functionality in commercial software: so I prefer something that's free-as-in-beer and/or open source, instead of a commercial tool. I suspect it's better if the tool is XML-aware, than to try to use software like diff3 which implements 3-way merge of flat text Given that

I have changed several files in a git repository, but have not committed them yet. I can get a list of the changes by just invoking git status . But how do I get a listing of the lines or the content that I have changed, in addition to the filenames? I initially thought about using git diff , but it seems to be useful only for comparing already commited changes. Usually I just do meld . , but on this case I'm connected to an external server via ssh. Mischa Arefiev git diff by default shows difference between your working directory and the index ( staging area for the next commit). If you have

Git offers these 4 diff algorithms, but without any further information what are their differences. What are the advantages of each of this algorithms? Is there some comparison of various cases where the algorithms perform differently? jelle foks I think there are multiple algorithms supported because none of the algorithms are clearly the best choice in all cases. The differences are in readability of the patch output and processing time needed to generate the patch. Summarizing, this is what I understand the differences are: Myers: The original algorithm as implemented in xdiff ( http://www

Is it possible to configure git diff to respect indentation and syntax? I am not talking about ignoring indentation and spaces, but rather to use blank lines, indentation levels and possibly brackets, to help matching the old lines to new lines. E.g. git diff often cuts through functions and their docblock, like this: class C { /** + * Goes to the bar. + */ + function bar() { + return 'bar'; + } + + /** * Gets your foo up to date. */ function foo() { When I would prefer class C { + + /** + * Goes to the bar. + */ + function bar() { + return 'bar'; + } /** * Gets your foo up to date. */

I need to write a module to detect similar documents. I have read many papers of fingerprints of documents techniques and others, but I do not know how to write code or implement such a solution. The algorithm should work for Chinese, Japanese, English and German language or be language independent. How can I accomplish this? Bayesian filters have exactly this purpose. That's the techno you'll find in most tools that identify spam. Example, to detect a language (from http://sebsauvage.net/python/snyppets/#bayesian ) : from reverend.thomas import Bayes guesser = Bayes() guesser.train('french',

How can I plot the results of a unix diff command side-to-side instead of one difference after the other? See below for an example: diff /tmp/test1 /tmp/test2 1,4c1,2 < asfdsadf < asdfsad < fsaf < fdsadf --- > asdfsafdsf > saf 6,8d3 < sadf < asdf < sadf 10d4 < fasd 12,13c6,14 < sadfa < fd --- > sadf > sadf > sadf > sadf > sadf > sadf > sadf > sadf > safa I would like to have something like: diff /tmp/test1 /tmp/test2 1,4c1,2 < asfdsadf > asdfsafdsf < asdfsad > saf < fsaf < fdsadf --- 6,8d3 < sadf < asdf < sadf 10d4 < fasd 12,13c6,14 < sadfa > sadf < fd > sadf --- > sadf > sadf > sadf > sadf >