Merge branch 'rs/swap'

Code clean-up.

* rs/swap:
  graph: use SWAP macro
  diff: use SWAP macro
  use SWAP macro
  apply: use SWAP macro
  add SWAP macro

diff --cc diff.c
Simple merge

diff --cc git-compat-util.h
Simple merge

diff --cc graph.c
Simple merge