diff --git a/.gitignore b/.gitignore index 1944fd6..bcf3c56 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,6 @@ +.vscode/ +*.o *.tmp +myreadme.txt + + diff --git a/abc.txt b/abc.txt index e69de29..42df16c 100644 --- a/abc.txt +++ b/abc.txt @@ -0,0 +1,6 @@ +Making changes +in feature-a branch ... + +A newline + +a new line again diff --git a/xxx b/asdada similarity index 100% rename from xxx rename to asdada diff --git a/main.cpp b/main.cpp index 8c358d5..ae5a91d 100644 --- a/main.cpp +++ b/main.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -11,8 +10,14 @@ using namespace std; #include "quicksort.h" +// Adding a new line +// This is a new line .... int main(int argc, char* argv[]) { +// Real feature-a line 1 +// Real feature-a line 2 +// Which branch? + std::vector v(10); v[0]="Paris"; v[1]="London"; @@ -35,6 +40,7 @@ int main(int argc, char* argv[]) std::for_each(v.begin(), v.end(), print); std::cout<<'\n'; + // data int a[]={3,8,0,6,7,4,2,1,9,3,1,8,3,9,2,0,9}; int *a_end=a+sizeof a/sizeof(int); diff --git a/quicksort.cpp b/quicksort.cpp index 9e1cc54..0a61acd 100644 --- a/quicksort.cpp +++ b/quicksort.cpp @@ -12,6 +12,8 @@ Retrieved from: http://en.literateprograms.org/Quicksort_(C_Plus_Plus)?oldid=109 #include "quicksort.h" +// Adding a line of comment + template IT partition(IT begin, IT end, IT pivot) { typename std::iterator_traits::value_type piv(*pivot); diff --git a/quicksort.zip b/quicksort.zip deleted file mode 100644 index beab777..0000000 Binary files a/quicksort.zip and /dev/null differ diff --git a/xyz.txt b/xyz.txt new file mode 100644 index 0000000..e69de29