jgaunt/CyberChef
2
0
Fork 0
mirror of https://github.com/gchq/CyberChef synced 2025-12-22 03:03:26 +00:00
Code Issues Releases Wiki Activity

Added nesting to Merge/Fork/Subsection

Browse Source
This commit is contained in:
n1073645
2022-06-17 09:17:28 +01:00
parent 54fdc05e3a
commit fc91469807
6 changed files with 146 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/operations/Merge.mjs
View File

@@ -20,10 +20,16 @@ class Merge extends Operation {
this.name = "Merge";
this.flowControl = true;
this.module = "Default";
this.description = "Consolidate all branches back into a single trunk. The opposite of Fork.";
this.description = "Consolidate all branches back into a single trunk. The opposite of Fork. Unticking the Merge All checkbox will only consolidate all branches up to the nearest Fork/Subsection.";
this.inputType = "string";
this.outputType = "string";
this.args = [];
this.args = [
{
name: "Merge All",
type: "boolean",
value: true,
}
];
}
/**