extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-06-30 22:50:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

engine-q merge

Browse Source
This commit is contained in:
Fernando Herrera
2022-02-07 19:11:34 +00:00
parent 265ee1281d 9259a56a28
commit fdce6c49ab
1965 changed files with 119062 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,11 @@ 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