index 3793267dadfa52a30cb59ad75170f5f9e9b8e81f..8030ec4d01de8cf2c7a62a7b1fd8d917e6d14b53 100644 (file)
initial manual merge, and later by noticing the same automerge
results and applying the previously recorded hand resolution.
+[NOTE]
+You need to set the configuration variable rerere.enabled to
+enable this command.
+
COMMANDS
--------
GIT
---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite