Posted
by larryq
on Stack Overflow
See other posts from Stack Overflow
or by larryq
Published on 2009-12-02T06:12:02Z
Indexed on
2010/03/31
21:43 UTC
Read the original article
Hit count: 485
Just wondering what's out there that everyone likes. I have to merge some changes among several developers (C#) and wanted to see what kind of alternatives to windiff are around.
© Stack Overflow or respective owner
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
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
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
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
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
as seen on Server Fault
- Search for 'Server Fault'
I am trying to add a new member to our DFS topology. We have 3 DCs (VMs - VMware) running Windows server 2012, two servers are located in or Primary site and the third at our DR site. Currently the two servers at our primary site are currently replicating DFS (full mesh) and are working fine.
I have…
>>> More
as seen on Server Fault
- Search for 'Server Fault'
I have a website that is we are now deploying to windows 2008 servers that has worked in the past on IIS6 without a problem. It is using .net 2 framework. Most of the website works. Just when we create a screen report over a certain size on the server we get this error.
Event code: 3005
Event…
>>> More
as seen on Server Fault
- Search for 'Server Fault'
I have a website that is we are now deploying to windows 2008 servers that has worked in the past on IIS6 without a problem. It is using .net 2 framework. Most of the website works. Just when we create a screen report over a certain size on the server we get this error.
Event code: 3005
Event…
>>> More
as seen on Super User
- Search for 'Super User'
I have Windows 7 Ultimate OS.
I'm opening mmc.exe as administrator and trying add Certificates or any other snap-in, then while loading that snap-in MMC breaks and displays following message and after that it closes automatically once I click on close button on that message. What could be the problem…
>>> More
as seen on Game Development
- Search for 'Game Development'
There is a number of ways to catch mouse or keyboard under Windows. So I tried some of them, but every of them has some advantages and drawbacks. I want to ask you: Which method do use?
I've tried these:
WM_KEYDOWN/WM_KEYUP - Main disadvantage is that, I can't distinguish between left and right-handed…
>>> More
