merge-recursive: Move process_entry's content merging into a function

[git.git] / Documentation / gitdiffcore.txt

diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt
index dcdea54df3450f82cc898db93474e4be4981187c..5d91a7e5b3a40cbf41f03a81799c162775c36607 100644 (file)
--- a/Documentation/gitdiffcore.txt
+++ b/Documentation/gitdiffcore.txt
@@ -3,7 +3,7 @@ gitdiffcore(7)
 
 NAME
 ----
 
 NAME
 ----

-gitdiffcore - Tweaking diff output (June 2005)
+gitdiffcore - Tweaking diff output

 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------


@@ -227,8 +227,8 @@ changes that touch a specified string, and is controlled by the
 commands.
 
 When diffcore-pickaxe is in use, it checks if there are
 commands.
 
 When diffcore-pickaxe is in use, it checks if there are

-filepairs whose "original" side has the specified string and
-whose "result" side does not.  Such a filepair represents "the
+filepairs whose "result" side has the specified string and
+whose "origin" side does not.  Such a filepair represents "the

 string appeared in this changeset".  It also checks for the
 opposite case that loses the specified string.
 
 string appeared in this changeset".  It also checks for the
 opposite case that loses the specified string.