diff Questions
2
Solved
I need to highlight the differences between two simple strings with python, enclosing the differing substrings in a HTML span attribute. So I'm looking for a simple way to implement the function il...
6
Solved
Sometimes while editing three files using vimdiff I want to copy a hunk from one file to both of the other two. Normally this would be accomplished like so:
:diffput 2
:diffput 3
However, :help ...
4
I'm trying to figure out a way to more rapidly determine where new construction is happening by comparing annual satellite imagery.
In Google Earth, you can roll back the clock on satellite imager...
Fahey asked 22/9, 2015 at 14:26
2
Solved
Let's say I have this data.frame (with 3 variables)
ID Period Score
123 2013 146
123 2014 133
23 2013 150
456 2013 205
456 2014 219
456 2015 140
78 2012 192
78 2013 199
78 2014 133
78 2015 170
U...
13
Solved
How do I do a diff of two strings or arrays in Ruby?
6
Solved
How can I display only different rows using diff in a separate file?
For example, the file number 1 contains the line:
1;john;125;3
1;tom;56;2
2;jack;10;5
A file number 2 contains the following...
7
Solved
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 ...
4
Let's say I've clicked on a file in the Git changes view and it opened a diff. I realize I can (usually) edit that file on the right side of the diff.
Is there a command that will open the right ha...
Smoko asked 2/2, 2021 at 17:41
3
Solved
How can I diff two files and ignore lines starting with a sequence.
E.g
File1:
abc
def
time:123
File2:
igh
def
time:345
With unix diff it will report
<time:123
>time:345
I want to i...
4
How can I install Meld on MacOS, and then set it up as my difftool and mergetool in git?
Virtu asked 10/4, 2017 at 8:0
13
Solved
There are two files called "a.txt" and "b.txt" both have a list of words. Now I want to check which words are extra in "a.txt" and are not in "b.txt".
I need a efficient algorithm as I need to co...
Afterworld asked 24/1, 2013 at 11:54
8
Solved
I need to work with large files and must find differences between two. And I don't need the different bits, but the number of differences.
To find the number of different rows I come up with
dif...
5
Solved
I am required to print out the git diff output for the appendix of a thesis paper. I really like the output of git diff --color-words, but I have absolutely no idea how to bring this formatting, wi...
2
I often use git log -p <file> or git log -p <directory> to get a comprehensive summary of the changes in a file or set of files. It outputs a history of the commits affecting the files,...
Changeless asked 19/3, 2014 at 11:7
1
What do I have to write in the .gitconfig file in order for git diff to behave as it was git diff --word-diff?
For now, searching for \bword in man git-config I've found diff.wordRegex, and given t...
Rhotacism asked 11/3, 2022 at 15:51
5
Solved
I'm trying to recursively compare two Subversion working copy folders using WinMerge.
Unfortunately, WinMerge displays lots of differencing files inside of the subversion control folders (.svn or _...
4
Solved
I have a unit test test case created with mocha and chai's expect where I deeply compare an array of value objects to the parsed content of a JSON file.
My record object has about 20 properties, a...
Ingathering asked 25/8, 2017 at 12:48
19
I've had a look at all similar questions. However, I've double checked and something strange is definitely happening.
On one server (Solaris with Git 1.8.1) I cloned the Git repository then copied...
14
Open Source project Trac has an excellent diff highlighter — it highlights changed lines and changed bytes in each changed line! See here or here for examples.
Is there way to use the same c...
3
I have 2 large SQL files of around 8GB each. But, in the latest backup I find that one file has 300MB data missing.
I just want to compare which data is missing, so that I can check that was it ju...
13
Solved
Is it possible to ask git diff to include untracked files in its diff output, or is my best bet to use git add on the newly created files and the existing files I have edited, then use:
git diff --...
13
Solved
Is it possible to ask git diff to include untracked files in its diff output, or is my best bet to use git add on the newly created files and the existing files I have edited, then use:
git diff --...
3
Solved
In VS Code, for a given commit I would like to see inline diffs from all files in one view or page, so that I would not have to click to see diffs for each file separately.
I can't find any extensi...
Alastair asked 26/10, 2021 at 14:2
3
Solved
The documentation on textconv at https://git.wiki.kernel.org/index.php/Textconv has the succinct wording:
~/.gitconfig must indicate the command to execute for the the textconv driver:
[diff "&...
Motile asked 9/4, 2019 at 21:15
5
Solved
Every time I do an hg diff file.ext I end up using a console diff application. I would like to use Kdiff3 or WinMerge (I'm using Windows).
Is there a way to change that? I can't find a reference i...
Potpourri asked 26/10, 2008 at 16:14
1 Next >
© 2022 - 2025 — McMap. All rights reserved.