index c4d4263238e5b7c6dff705de5d8552a577fc35d6..8ce492c8f2738275aa951f2fd98f1bcca16baee6 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 config variable rerere.enabled to enable this
-command.
-
COMMANDS
--------