Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions config.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Some cnfigsettings in remote
And a new feature from local
Another option
1 change: 1 addition & 0 deletions feature3/feature3.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A feature 3 file
1 change: 1 addition & 0 deletions feature4/feature4.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A new feature
3 changes: 3 additions & 0 deletions utility/config.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
config setting 1
config setting 2
config setting 3
2 changes: 2 additions & 0 deletions utility/feature.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
feature 1
featire 2
3 changes: 3 additions & 0 deletions utility/utility.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
util1
util2
util 3