path: root/Documentation/diffcore.txt
diff options
authorChristian Meder <>2005-10-05 22:08:26 (GMT)
committerJunio C Hamano <>2005-10-05 22:08:26 (GMT)
commitf73ae1fc5d5308fecf0a4bdbd7312f7f5b00df55 (patch)
treeaed25558519ec2fdada1fd8b7d17fdf013fa8f6d /Documentation/diffcore.txt
parente091eb93258f05a58bc5d1c60f058f5f57dd92b6 (diff)
Some typos and light editing of various manpages
Typos, light editing and clarifications. Signed-off-by: Christian Meder <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/diffcore.txt')
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 '+'.