diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-05 22:33:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-05 22:33:58 (GMT) |
| commit | 952f87a6ca50a4d172bfb99c3c6e44e801212955 (patch) | |
| tree | c47331824274f86d6b907199b75ac643f2e3067b /Documentation/diffcore.txt | |
| parent | 144c83f687e9c3020497662dfae47d03005a9e21 (diff) | |
| parent | 4cfc63db1daa0ebdb284ae6972928e41a317a0c8 (diff) | |
| download | git-952f87a6ca50a4d172bfb99c3c6e44e801212955.zip git-952f87a6ca50a4d172bfb99c3c6e44e801212955.tar.gz git-952f87a6ca50a4d172bfb99c3c6e44e801212955.tar.bz2 | |
Merge branch 'fixes'
Diffstat (limited to 'Documentation/diffcore.txt')
| -rw-r--r-- | Documentation/diffcore.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt index a1f03df..9d20a4f 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 '+'. |