anshulc55 · manishyadav506 · Aug 23, 2019 · Sep 1, 2019 · Sep 1, 2019 · Sep 1, 2019
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/Jenkins.iml b/.idea/Jenkins.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/java-maven-junit-helloworld-master/Readme.txt b/java-maven-junit-helloworld-master/Readme.txt
@@ -1 +1,6 @@
-This is Sample Text File.
+This is Sample Text File.
+This file is modified in IntelliJ IDEA.
+
+This file is created in my_test_branch.
+
+This file will now be merged with master branch.
diff --git a/java-maven-junit-helloworld-master/Readme.txt.txt b/java-maven-junit-helloworld-master/Readme.txt.txt
@@ -0,0 +1,2 @@
+This is my Text file.
+This file mofified for git stash test.
diff --git a/java-maven-junit-helloworld-master/test.txt b/java-maven-junit-helloworld-master/test.txt
@@ -0,0 +1 @@
+this is just a test file.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		This is my Text file.
		This file mofified for git stash test.