\entry{overview of diff and patch}{1}{overview of \code {diff} and \code {patch}}
\entry{introduction}{3}{introduction}
\entry{hunks}{3}{hunks}
\entry{blank and tab difference suppression}{4}{blank and tab difference suppression}
\entry{tab and blank difference suppression}{4}{tab and blank difference suppression}
\entry{blank line difference suppression}{4}{blank line difference suppression}
\entry{case difference suppression}{5}{case difference suppression}
\entry{regular expression suppression}{5}{regular expression suppression}
\entry{summarizing which files differ}{5}{summarizing which files differ}
\entry{brief difference reports}{5}{brief difference reports}
\entry{binary file diff}{5}{binary file diff}
\entry{text versus binary diff}{5}{text versus binary diff}
\entry{output formats}{7}{output formats}
\entry{format of diff output}{7}{format of \code {diff} output}
\entry{diff sample input}{7}{\code {diff} sample input}
\entry{sample input for diff}{7}{sample input for \code {diff}}
\entry{normal output format}{7}{normal output format}
\entry{{\tt\less} output format}{7}{\samp {{\tt\less}} output format}
\entry{context output format}{9}{context output format}
\entry{! output format}{9}{\samp {!} output format}
\entry{unified output format}{11}{unified output format}
\entry{{\tt\char 43}- output format}{11}{\samp {{\tt\char 43}-} output format}
\entry{headings}{12}{headings}
\entry{section headings}{12}{section headings}
\entry{specified headings}{12}{specified headings}
\entry{regular expression matching headings}{12}{regular expression matching headings}
\entry{C function headings}{13}{C function headings}
\entry{function headings, C}{13}{function headings, C}
\entry{alternate file names}{13}{alternate file names}
\entry{file name alternates}{13}{file name alternates}
\entry{side by side}{14}{side by side}
\entry{two-column output}{14}{two-column output}
\entry{columnar output}{14}{columnar output}
\entry{side by side format}{14}{side by side format}
\entry{script output formats}{15}{script output formats}
\entry{ed script output format}{15}{\code {ed} script output format}
\entry{forward ed script output format}{16}{forward \code {ed} script output format}
\entry{RCS script output format}{17}{RCS script output format}
\entry{merged output format}{17}{merged output format}
\entry{if-then-else output format}{17}{if-then-else output format}
\entry{C if-then-else output format}{17}{C if-then-else output format}
\entry{ifdef output format}{17}{\code {ifdef} output format}
\entry{line group formats}{18}{line group formats}
\entry{formats for if-then-else line groups}{18}{formats for if-then-else line groups}
\entry{line formats}{20}{line formats}
\entry{tabstop alignment}{27}{tabstop alignment}
\entry{aligning tabstops}{27}{aligning tabstops}
\entry{paginating diff output}{27}{paginating \code {diff} output}
\entry{performance of diff}{29}{performance of \code {diff}}
\entry{comparing three files}{31}{comparing three files}
\entry{format of diff3 output}{31}{format of \code {diff3} output}
\entry{diff3 sample input}{31}{\code {diff3} sample input}
\entry{sample input for diff3}{31}{sample input for \code {diff3}}
\entry{hunks for diff3}{32}{hunks for \code {diff3}}
\entry{diff3 hunks}{32}{\code {diff3} hunks}
\entry{merging from a common ancestor}{35}{merging from a common ancestor}
\entry{conflict}{35}{conflict}
\entry{overlap}{35}{overlap}
\entry{overlapping change, selection of}{35}{overlapping change, selection of}
\entry{unmerged change}{35}{unmerged change}
\entry{conflict marking}{36}{conflict marking}
\entry{{\tt\less}{\tt\less}{\tt\less}{\tt\less}{\tt\less}{\tt\less}{\tt\less} for marking conflicts}{36}{\samp {{\tt\less}{\tt\less}{\tt\less}{\tt\less}{\tt\less}{\tt\less}{\tt\less}} for marking conflicts}
\entry{merged diff3 format}{37}{merged \code {diff3} format}
\entry{incomplete line merging}{38}{incomplete line merging}
\entry{System V diff3 compatibility}{38}{System V \code {diff3} compatibility}
\entry{diff merging}{39}{diff merging}
\entry{interactive merging}{39}{interactive merging}
\entry{sdiff output format}{39}{\code {sdiff} output format}
\entry{merge commands}{39}{merge commands}
\entry{merging interactively}{39}{merging interactively}
\entry{patch input format}{41}{\code {patch} input format}
\entry{imperfect patch application}{42}{imperfect patch application}
\entry{white space in patches}{42}{white space in patches}
\entry{reversed patches}{42}{reversed patches}
\entry{inexact patches}{42}{inexact patches}
\entry{fuzz factor when patching}{42}{fuzz factor when patching}
\entry{empty files, removing}{43}{empty files, removing}
\entry{removing empty files}{43}{removing empty files}
\entry{multiple patches}{43}{multiple patches}
\entry{patch messages and questions}{44}{\code {patch} messages and questions}
\entry{diagnostics from patch}{44}{diagnostics from \code {patch}}
\entry{messages from patch}{44}{messages from \code {patch}}
\entry{patch making tips}{45}{patch making tips}
\entry{tips for patch making}{45}{tips for patch making}
\entry{invoking cmp}{47}{invoking \code {cmp}}
\entry{cmp invocation}{47}{\code {cmp} invocation}
\entry{cmp options}{47}{\code {cmp} options}
\entry{options for cmp}{47}{options for \code {cmp}}
\entry{invoking diff}{49}{invoking \code {diff}}
\entry{diff invocation}{49}{\code {diff} invocation}
\entry{diff options}{49}{\code {diff} options}
\entry{options for diff}{49}{options for \code {diff}}
\entry{invoking diff3}{55}{invoking \code {diff3}}
\entry{diff3 invocation}{55}{\code {diff3} invocation}
\entry{diff3 options}{55}{\code {diff3} options}
\entry{options for diff3}{55}{options for \code {diff3}}
\entry{invoking patch}{57}{invoking \code {patch}}
\entry{patch invocation}{57}{\code {patch} invocation}
\entry{directories and patch}{57}{directories and patch}
\entry{patching directories}{57}{patching directories}
\entry{backup file names}{58}{backup file names}
\entry{reject file names}{59}{reject file names}
\entry{patch options}{59}{\code {patch} options}
\entry{options for patch}{59}{options for \code {patch}}
\entry{invoking sdiff}{63}{invoking \code {sdiff}}
\entry{sdiff invocation}{63}{\code {sdiff} invocation}
\entry{sdiff options}{63}{\code {sdiff} options}
\entry{options for sdiff}{63}{options for \code {sdiff}}
\entry{incomplete lines}{67}{incomplete lines}
\entry{full lines}{67}{full lines}
\entry{newline treatment by diff}{67}{newline treatment by \code {diff}}
\entry{projects for directories}{69}{projects for directories}
\entry{directory structure changes}{69}{directory structure changes}
\entry{special files}{69}{special files}
\entry{file names with unusual characters}{69}{file names with unusual characters}
\entry{binary file patching}{70}{binary file patching}
\entry{large files}{70}{large files}
\entry{bug reports}{70}{bug reports}
\entry{reporting bugs}{70}{reporting bugs}

.