index 3ed9f84524cd850335f97c0b8260dfc1fde66437..1c49e6995b42e42f1aba4e7b24d073e50c3b5234 100644 (file)
$ git-merge-index git-merge-one-file hello.c
-------------------------------------------------
$ 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.
How git stores objects efficiently: pack files
----------------------------------------------
How git stores objects efficiently: pack files
----------------------------------------------