Feature a

.gitignore

@@ -1 +1,6 @@
+.vscode/
+*.o
 *.tmp
+myreadme.txt
+
+

abc.txt

@@ -0,0 +1,6 @@
+Making changes 
+in feature-a branch ...
+
+A newline
+
+a new line again

main.cpp

@@ -1,4 +1,3 @@
-#include <vector>
 #include <list>
 #include <deque>
 #include <set>
@@ -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<std::string> 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::string>);
 	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);
 

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<typename IT> IT partition(IT begin, IT end, IT pivot)
 {
 	typename std::iterator_traits<IT>::value_type piv(*pivot);