* Add a paragraph suggesting that the merge option be used only for files that users have modified. People have been using this option for all files that are different, causing unecessary confusion. |
||
---|---|---|
.. | ||
Makefile | ||
mergemaster.8 | ||
mergemaster.sh |
* Add a paragraph suggesting that the merge option be used only for files that users have modified. People have been using this option for all files that are different, causing unecessary confusion. |
||
---|---|---|
.. | ||
Makefile | ||
mergemaster.8 | ||
mergemaster.sh |