How to change default diff tools You can specify an external diff tool by modifying the file map, in “c:\program files\rational\ClearCase\lib\mgrs” The WinMerge suggested by Paul actually modifies that file. Each map line has 3 parts: the CC filetype, the CC action, and the application. Find the section in the map file for text_file_delta file … Read more
Those are called (c)hunk headers and contain the range information. They are surrounded by double at signs @@. They are of the format: @@ -l,s +l,s @@ where l is the starting line number and s is the number of lines the change (c)hunk applies to for each respective file. The – indicates the original … Read more
I found the solution of how to change permissions (also) on Windows here: http://blog.lesc.se/2011/11/how-to-change-file-premissions-in-git.html For example following command adds user execute permission to an arbitrary file: git update-index –chmod=+x <file>
It’s possible to use a recursive function that iterates by the object keys. Then use the Object.is to test for NaN and null. Then test if the second object is the type that cast to false like 0, NaN, or null. List the keys of both objects and concatenate them to test of missing keys … Read more
At first glance, it does not seem possible to reuse an external diff tool session. The git-mergetool documentation clearly states: If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable mergetool.<tool>.trustExitCode can be set to true. Otherwise, git-mergetool will prompt the user to indicate … Read more
There’s another nice trick you can use to significantly improve the look of a rendered HTML diff. Although this doesn’t fully solve the initial problem, it will make a significant difference in the appearance of your rendered HTML diffs. Side-by-side rendered HTML will make it very difficult for your diff to line up vertically. Vertical … Read more
In case you want the difference recursively, I have written a package for python: https://github.com/seperman/deepdiff Installation Install from PyPi: pip install deepdiff Example usage Importing >>> from deepdiff import DeepDiff >>> from pprint import pprint >>> from __future__ import print_function # In case running on Python 2 Same object returns empty >>> t1 = {1:1, … Read more
Might be a little late, but I was in the same situation like you and ended up creating my own library for exactly your use-case. Since I was forced to come up with a solution myself, I decided to release it on Github, to spare others the hard work. You can find it here: https://github.com/SQiShER/java-object-diff … Read more
GitHub suggests that you should make sure to only use \n as a newline character in git-handled repos. There’s an option to auto-convert: $ git config –global core.autocrlf true Of course, this is said to convert crlf to lf, while you want to convert cr to lf. I hope this still works … And then … Read more
There are multiple questions here, whose answers intertwine. Let’s start with rename and copy detection, then move on to branches. Rename detection However because the diff takes into account the file path as part of the file name, files with the same name, in the two different directories, result in a diff output with the … Read more