index 4e8438098fc9862ae83280f8f191329d1251bc55..d639985693705930cba6f078b0bd1f8b61b65da4 100644 (file)
-p::
--preserve-merges::
- Instead of ignoring merges, try to recreate them. This option
- only works in interactive mode.
+ Instead of ignoring merges, try to recreate them.
include::merge-strategies.txt[]