index abafefc71c37d8a3015f0227d24da0f07096fe4c..24b060b91e25855c47ef594dfcbeca43cdb5e677 100644 (file)
git-merge-index git-merge-one-file hello.c
-and that is what higher level `git resolve` is implemented with.
+and that is what higher level `git merge -s resolve` is implemented
+with.