carta

git-merge-index(1) on Linux

The text f898d40e7df6, as Debian 6.0 (Squeeze) shipped it.

Run a merge for files needing merging

Flags it lists

git-merge-index(1) on Linux now