Lines Matching refs:dfn

116 often called a @dfn{diff} or @dfn{patch}.  For files that are identical,
139 @command{patch} program to update, or @dfn{patch}, a copy of the file.  If you
244 @dfn{hunks}.  Comparing two identical files yields one sequence of
311 the other line has none.  @dfn{White space} characters include
569 files are called the @dfn{context}.
572 around the differing lines: @dfn{context format} and @dfn{unified
1714 called an @dfn{incomplete line} because its last character is not a
1715 newline.  All other lines are called @dfn{full lines} and end in a
2091 called @dfn{diff3 hunks}, by analogy with @command{diff} hunks
2093 hunk, the hunk is called a @dfn{three-way hunk}; if just two input files
2094 differ, it is a @dfn{two-way hunk}.
2164 a @dfn{conflict}.  When all three input files differ, we call the
2165 conflict an @dfn{overlap}.
2196 @dfn{unmerged changes}, i.e.@: changes where @var{mine} and @var{yours}
2885 To determine the @dfn{best} of a nonempty list of file names,
4081 tries to intuit from the @dfn{leading text} (any text in the patch