Diff tools highlight what changed between text versions for review and merging.
Diff formats
- Unified diff: +/- lines with context (Git default).
- Context diff: Before/after sections with ! markers.
- Side-by-side: Two-column comparison.
- Inline/word diff: Character-level changes within lines.
Common diff notation
- Lines starting with - (removed).
- Lines starting with + (added).
- Lines starting with @ (chunk headers).
- Unchanged lines for context.
Use cases
- Code review in pull requests.
- Document version comparison.
- Configuration file changes.
- Merge conflict resolution.
- Backup verification.
Tools
- Git diff, diff command (Unix).
- IDE built-in comparison.
- Online diff checkers.
- Merge tools (Beyond Compare, Meld).
Advanced features
- Ignore whitespace changes.
- Word/character-level granularity.
- Three-way merge (base, theirs, yours).
- Syntax-aware diffing (for code).
Related Articles
View all articlesPhysical Security & CPTED: The Complete Guide to Protecting Facilities, Data Centers, and Critical Assets
A comprehensive guide to physical security covering CPTED principles, security zones, access control, fire suppression, and environmental controls for protecting facilities and data centers.
Read article →Threat Modeling with STRIDE and DREAD: A Complete Guide to Proactive Security Architecture
Master threat modeling with STRIDE and DREAD frameworks to identify, classify, and prioritize security threats before they become vulnerabilities. This comprehensive guide covers data flow diagrams, mitigation mappings, MITRE ATT&CK integration, and building an enterprise threat modeling program.
Read article →Is USOClient.exe Safe? Windows Update Process Explained
Learn if USOClient.exe is safe or malware. How to verify it's legitimate, check digital signature, and understand what this Windows Update process does.
Read article →Building a Webhook Provider: Design, Delivery, Documentation & SDK Guide
Learn to build production-grade webhook delivery systems. Master webhook API design, reliable delivery infrastructure, signature verification, retry logic, documentation standards, and client SDK development.
Read article →Explore More Development
View all termsAPI (Application Programming Interface)
A set of rules and protocols that allows different software applications to communicate and exchange data.
Read more →Cron Expression
A time-based job scheduling syntax using five or six fields to specify when tasks should run.
Read more →DevOps
A set of practices combining software development (Dev) and IT operations (Ops) to shorten development cycles and deliver high-quality software continuously.
Read more →Diff Algorithm
A computational method for comparing two sets of data and identifying differences between them.
Read more →GitOps
An operational framework that uses Git repositories as the single source of truth for declarative infrastructure and application configurations.
Read more →JSON (JavaScript Object Notation)
A lightweight data interchange format using human-readable text to represent structured data.
Read more →