From 28890451d84ed4423b66af4a67e2d78ebf57b6b6 Mon Sep 17 00:00:00 2001 From: Thorin-Oakenpants Date: Mon, 25 Dec 2017 20:30:38 +1300 Subject: [PATCH] Updated 3.3 Updater Scripts (markdown) --- 3.3-Updater-Scripts.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/3.3-Updater-Scripts.md b/3.3-Updater-Scripts.md index 0fcf5c0..4919f3d 100644 --- a/3.3-Updater-Scripts.md +++ b/3.3-Updater-Scripts.md @@ -26,10 +26,7 @@ writes the console output to the logfile `user.js-update-log.txt` works just like `-Log` but also opens the logfile after updating - `-Merge` -merges overrides instead of appending them. Comments are appended normally. `_user.js.parrot` lines are not merged. Overrides for inactive (commented out) user.js prefs will be appended. -When `-Merge` and `-MultiOverrides` are used together, a `user-overrides-merged.js` file is also generated in the root directory for quick reference. It contains only the merged data from override files and can be safely discarded after updating, or used as the new user-overrides.js. -When there are conflicting records for the same pref, the value of the last one declared will be used. -~~Lastly, `-merge` doesn't like exclamation marks (`!`) in pref-values or comments behind user_pref overrides! If a pref-value needs them or you can't live without a ton of `!!!`s in your user_pref override comments, you can prepend a TAB or a JS multi-line-comment which will then append that line instead of trying to merge it.~~ (EDIT: fixed in v4.0) +merges overrides instead of appending them. Comments are appended normally. `_user.js.parrot` lines are not merged. Overrides for inactive (commented out) user.js prefs will be appended. When `-Merge` and `-MultiOverrides` are used together, a `user-overrides-merged.js` file is also generated in the root directory for quick reference. It contains only the merged data from override files and can be safely discarded after updating, or used as the new user-overrides.js. When there are conflicting records for the same pref, the value of the last one declared will be used. The following example illustrates how `-merge` works: ghacks user.js file contains this: