X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fdiffcore.txt;h=9d20a4ff19bc42497b15220cb3ad5a04594f6753;hb=ab1630a3ed31d6ec5ae83769c78ed542fe3c4a28;hp=a1f03df8f1cda96e13586fc9d447dfc8e5ffcf07;hpb=df8baa42fe4eeb5a021ac262caf601f44d2a5746;p=git.git diff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt index a1f03df8..9d20a4ff 100644 --- a/Documentation/diffcore.txt +++ b/Documentation/diffcore.txt @@ -177,7 +177,7 @@ diffcore-merge-broken --------------------- This transformation is used to merge filepairs broken by -diffcore-break, and were not transformed into rename/copy by +diffcore-break, and not transformed into rename/copy by diffcore-rename, back into a single modification. This always runs when diffcore-break is used. @@ -206,10 +206,10 @@ like these: * -B/60 (the same as above, since diffcore-break defaults to 50%). Note that earlier implementation left a broken pair as a separate -creation and deletion patches. This was unnecessary hack and +creation and deletion patches. This was an unnecessary hack and the latest implementation always merges all the broken pairs back into modifications, but the resulting patch output is -formatted differently to still let the reviewing easier for such +formatted differently for easier review in case of such a complete rewrite by showing the entire contents of old version prefixed with '-', followed by the entire contents of new version prefixed with '+'.