Un bloc és un bloc de línies que han estat marcades com a diferents entre font i destí i poden incloure línies de context depenent del format de diff, al valor Línies de context (mireu).
A hunk is a c hunk of lines that have been marked as different between source and destination and may include context lines depending on the diff format Lines of Context value (see).