is it possible to add a comment to a diff file (unified)?

The unified diff starts with two line header: — from-file from-file-modification-time +++ to-file to-file-modification-time Anything before this header is ignored, so you can add any comment here, for example: This may be some useful description of this patch that will be ignored by the diff/patch utility. — a/foo 2002-02-21 23:30:39.942229878 -0800 +++ b/foo 2002-02-21 23:30:50.442260588 … Read more

Can TortoiseMerge be used as a difftool with Windows Git Bash?

The following settings work fine for me. However, I am using TortoiseGit not TortoiseSVN. Notice the difference in the parameters for diff. [diff] tool = tortoisediff [difftool] prompt = false [merge] tool = tortoisemerge [mergetool] prompt = false keepBackup = false [difftool “tortoisediff”] cmd = \””c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe”\” -mine “$REMOTE” -base “$LOCAL” [mergetool “tortoisemerge”] cmd = … Read more

Examples of different results produced by the standard (Myers), minimal, patience and histogram diff algorithms

I think there are multiple algorithms supported because none of the algorithms are clearly the best choice in all cases. The differences are in readability of the patch output and processing time needed to generate the patch. Summarizing, this is what I understand the differences are: Myers: The original algorithm as implemented in xdiff (http://www.xmailserver.org/xdiff-lib.html … Read more