mirror of
https://github.com/nushell/nushell
synced 2024-12-26 13:03:07 +00:00
Fix a rebase mistake
This commit is contained in:
parent
87dbd3d5ac
commit
f858e854bf
1 changed files with 6 additions and 17 deletions
|
@ -29,24 +29,13 @@ Syntax: `config {flags}`
|
|||
|
||||
### Variables
|
||||
|
||||
<<<<<<< HEAD
|
||||
| Variable | Type | Description |
|
||||
| Variable | Type | Description |
|
||||
| ---------- | ---------------- | ------------------------------------------------------- |
|
||||
| path | table of strings | PATH to use to find binaries |
|
||||
| env | row | the environment variables to pass to external commands |
|
||||
| ctrlc_exit | boolean | whether or not to exit Nu after multiple ctrl-c presses |
|
||||
| table_mode | "light" or other | enable lightweight or normal tables |
|
||||
| edit_mode | "vi" or "emacs" | changes line editing to "vi" or "emacs" mode |
|
||||
=======
|
||||
| Variable | Type | Description |
|
||||
| ------------- | ------------- | ----- |
|
||||
| path | table of strings | PATH to use to find binaries |
|
||||
| env | row | the environment variables to pass to external commands |
|
||||
| ctrlc_exit | boolean | whether or not to exit Nu after multiple ctrl-c presses |
|
||||
| table_mode | "light" or other | enable lightweight or normal tables |
|
||||
| edit_mode | "vi" or "emacs" | changes line editing to "vi" or "emacs" mode |
|
||||
|
||||
> > > > > > > origin/master
|
||||
| path | table of strings | PATH to use to find binaries |
|
||||
| env | row | the environment variables to pass to external commands |
|
||||
| ctrlc_exit | boolean | whether or not to exit Nu after multiple ctrl-c presses |
|
||||
| table_mode | "light" or other | enable lightweight or normal tables |
|
||||
| edit_mode | "vi" or "emacs" | changes line editing to "vi" or "emacs" mode |
|
||||
|
||||
## Examples
|
||||
|
||||
|
|
Loading…
Reference in a new issue