diff

It is well-answered on this site that Bram Cohen's patience diff is found in bazaar as the default diff and as an option with git diff, but I am finding it difficult to source an independent standalone program that implements this particular diff algorithm. For example I'd like to apply patience diff to perforce diffs, and it's pretty clear with the canonical "frobnitz" code example how patience diff is better: The terminal on the right has invoked the git diff with the --patience flag. I also have set up the diff-highlight perl script, whose job it is to invert colors on matched-up lines

This has always lingered in the back of my mind, so I figure I might as well go ahead and ask. How does a wiki handle multiple edits on the same content? Here's a simplistic example of what I'm asking. Let's say that a page has the following content: I'm a page! And now let's say that two go to edit that page. Each person adds a sentence: Person one: I'm a page! I'm a second sentence in the same page! Person two: I'm a page! I'm a second sentence! Imagine each person's second sentence being an equally relevant but different fact about the topic of the page that each person wanted to add in.

I've been searching for a while and still can't find a simple solution to this problem I have. I want to produce a diff between two revisions of a file but I want the output to show all lines of my file. By the way, I'm on an AIX 5.3 using svn 1.6.17. Example: Comparing difference between revision 21 and 22 of my file "test_file" % svn cat -r21 test_file My Test File line 1 line 2 line 3 line 4 line 5 line 6 line 7 line 8 line 9 % svn cat -r22 test_file My Test File line 1 line 2 line 3 line 4 line 5 line 6 line 7 line 8 line 9 added after 1 added after 2 added after 3 % svn diff -r21:22 test

I've just seen this (old) post, and I was wondering if we could the same thing using GitHub flavoured markdown: Combine the normal syntax highlighting with the diff one. I tried a few things, like ```python&diff - import that + import this ``` ```python - import that + import this ``` ```pythondiff - import that + import this ``` ```diffpython - import that + import this ``` But none of them worked... So, do any of you know how to do this? Or it's not possible? The old post you refer to is " Syntax Highlighted Diffs ", Dec. 2014 However, nothing in the current GFM (GitHub Flavored Markdown)

I have a list of files in file.lst . Now I want to find all files in a directory dir which are older than 7 days, except those in the file.lst file. How can I either modify the find command or remove all entries in file.lst from the result? Example: file.lst : a b c Execute: find -mtime +7 -print > found.lst found.lst : a d e so what I expect is: d e Pipe your find command through grep -Fxvf : find -mtime +7 -print | grep -Fxvf file.lst What the flags mean: -F, --fixed-strings Interpret PATTERN as a list of fixed strings, separated by newlines, any of which is to be matched. -x, --line-regexp

This StackOverflow answer has an image of KDiff3 highlighting intra-line differences. Does someone know of a tool which can show the same (ex, via color) on the command line? Another way to think of this is wanting to diff each difference in a patch file. ire_and_curses I don't know if this is sufficiently command line for your purpose, but vimdiff can do this (even does colour). See for example the image in this related question . I tried all the tools I found: wdiff, dwdiff, kdiff3, vimdiff to show the difference between two long and slightly different lines. My favourite is diff-highlight