extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-07-03 16:13:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove old nushell/merge engine-q

Browse Source
This commit is contained in:
JT
2022-02-07 14:54:06 -05:00
parent 10c4c50f1f
commit d70d91e559
430 changed files with 14543 additions and 7865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/nu-path/src/dots.rs
View File

@ -19,11 +19,7 @@ fn handle_dots_push(string: &mut String, count: u8) {
string.pop(); // remove last '/'
}
<<<<<<< HEAD
/// Expands any occurrence of more than two dots into a sequence of ../ (or ..\ on windows), e.g.,
=======
/// Expands any occurence of more than two dots into a sequence of ../ (or ..\ on windows), e.g.,
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
/// "..." into "../..", "...." into "../../../", etc.
pub fn expand_ndots(path: impl AsRef<Path>) -> PathBuf {
// Check if path is valid UTF-8 and if not, return it as it is to avoid breaking it via string