As mentioned in my previous answer, just modify the map file located in: # up to ClearCase 7.0 c:\program files\rational\ClearCase\lib\mgrs or # ClearCase 7.1 and more c:\program files\IBM\RationalSDLC\ClearCase\lib\mgrs Each map line has 3 parts: the CC filetype, the CC action, and the application. In your case, find the section in the map file for text_file_delta … Read more
Semantic Merge. Languages supported, from the website: We started with C# and Vb.net, then added Java. Now C is already supported and then we’ll focus on C++, Objective-C and JavaScript, depending on your feedback
In git, you can merge without committing. Merge your patch first, then do: git diff –word-diff-regex=. Note the dot after the equals sign.
A one-line with 2 tmp files (not what you want) would be: foo | bar > file1.txt && baz | quux > file2.txt && diff file1.txt file2.txt With bash, you might try though: diff <(foo | bar) <(baz | quux) foo | bar | diff – <(baz | quux) # or only use process substitution … Read more
Short & sweet: git config –global diff.tool meld This configures Git to use meld as the diff tool. (You don’t need to specify the command line arguments, support for meld is built into Git.) Then, if you want a graphical diff instead of a textual one, you simply invoke git difftool instead of git diff … Read more
git config –global diff.tool vimdiff git config –global difftool.prompt false Typing git difftool yields the expected behavior. Navigation commands, :qa in vim cycles to the next file in the changeset without saving anything. Aliasing (example) git config –global alias.d difftool .. will let you type git d to invoke vimdiff. Advanced use-cases, By default, git … Read more
You can use the diff command for that: diff -bur folder1/ folder2/ This will output a recursive diff that ignore spaces, with a unified context: b flag means ignoring whitespace u flag means a unified context (3 lines before and after) r flag means recursive
The Myers algorithm is a “divide and conquer algorithm”: it works by finding recursively the central match of two sequences with the smallest edit script. Once this is done only the match is memorized, and the two subsequences preceding and following it are compared again recursively until there is nothing more to compare. Finding the … Read more
You may use git-ls-tree to see what the SHA-1 id of a given path was during a given commit: $ git ls-tree released-1.2.3 foo 160000 commit c0f065504bb0e8cfa2b107e975bb9dc5a34b0398 foo (My first thought was git show released-1.2.3 foo, but that fails with “fatal: bad object”.) Since you are scripting the output, you will probably want to get … Read more
Perhaps there is a better answer, but the best solution I’ve found so far is this. First, you must control the definition of “whitespace” that Git is currently using. git config core.whitespace ‘-trailing-space,-indent-with-non-tab,-tab-in-indent’ Next, you must control the definition of a word used. Instead of just using git diff -w, add –word-diff-regex='[^[:space:]]’: git diff -w … Read more