Skip to content

Commit

Permalink
Refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@AviralVerma13 @amitu
AviralVerma13 authored and amitu committed Aug 24, 2022
1 parent cb59646 commit 4917b48
Show file tree
Hide file tree
Showing 37 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion tests/21 - fpm resolve_conflict delete-it/input/.clone-state/cr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
2
3
4
5
5
2 changes: 1 addition & 1 deletion tests/21 - fpm resolve_conflict delete-it/input/.remote-state/history/FPM.1.ftd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- import: fpm

-- fpm.package: aviral
base: www.aviral.com
base: www.aviral.com
2 changes: 1 addition & 1 deletion tests/21 - fpm resolve_conflict delete-it/input/.remote-state/history/index.1.ftd
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-- ftd.text: Hello world
-- ftd.text: Hello world
2 changes: 1 addition & 1 deletion tests/21 - fpm resolve_conflict delete-it/input/index.ftd
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-- ftd.text: Hello world2
-- ftd.text: Hello world2
2 changes: 1 addition & 1 deletion tests/21 - fpm resolve_conflict delete-it/output/cr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
2
3
4
5
5
2 changes: 1 addition & 1 deletion tests/22 - fpm resolve_conflict revive-it/input/.clone-state/cr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
2
3
4
5
5
2 changes: 1 addition & 1 deletion tests/22 - fpm resolve_conflict revive-it/input/.remote-state/history/FPM.1.ftd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- import: fpm

-- fpm.package: aviral
base: www.avi.com
base: www.avi.com
2 changes: 1 addition & 1 deletion tests/22 - fpm resolve_conflict revive-it/input/.remote-state/history/index.1.ftd
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-- ftd.text: Hello world
-- ftd.text: Hello world
2 changes: 1 addition & 1 deletion tests/22 - fpm resolve_conflict revive-it/input/FPM.ftd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- import: fpm

-- fpm.package: aviral
base: www.avi.com
base: www.avi.com
2 changes: 1 addition & 1 deletion tests/22 - fpm resolve_conflict revive-it/input/index.ftd
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-- ftd.text: Hello world use ours
-- ftd.text: Hello world use ours
2 changes: 1 addition & 1 deletion tests/22 - fpm resolve_conflict revive-it/output/cr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
2
3
4
5
5
2 changes: 1 addition & 1 deletion tests/23 - fpm resolve_conflict use-theirs/input/.clone-state/cr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
7
8
9
10
10
2 changes: 1 addition & 1 deletion tests/23 - fpm resolve_conflict use-theirs/input/.remote-state/history/FPM.1.ftd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- import: fpm

-- fpm.package: aviral
base: www.aviral.com
base: www.aviral.com
2 changes: 1 addition & 1 deletion tests/23 - fpm resolve_conflict use-theirs/input/.remote-state/history/index.1.ftd
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-- ftd.text: Hello world
-- ftd.text: Hello world
2 changes: 1 addition & 1 deletion tests/23 - fpm resolve_conflict use-theirs/input/FPM.ftd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- import: fpm

-- fpm.package: aviral
base: www.aviral.com
base: www.aviral.com
2 changes: 1 addition & 1 deletion tests/23 - fpm resolve_conflict use-theirs/output/cr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
7
8
9
10
10
2 changes: 1 addition & 1 deletion tests/24 - fpm resolve_conflict use-ours/input/.clone-state/cr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
7
8
9
10
10
2 changes: 1 addition & 1 deletion tests/24 - fpm resolve_conflict use-ours/input/.remote-state/history/FPM.1.ftd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- import: fpm

-- fpm.package: aviral
base: www.aviral.com
base: www.aviral.com
2 changes: 1 addition & 1 deletion tests/24 - fpm resolve_conflict use-ours/input/.remote-state/history/index.1.ftd
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-- ftd.text: Hello world
-- ftd.text: Hello world
2 changes: 1 addition & 1 deletion tests/24 - fpm resolve_conflict use-ours/input/.remote-state/history/index.2.ftd
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-- ftd.text: Hello world3
-- ftd.text: Hello world3
2 changes: 1 addition & 1 deletion tests/24 - fpm resolve_conflict use-ours/input/FPM.ftd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- import: fpm

-- fpm.package: aviral
base: www.aviral.com
base: www.aviral.com
2 changes: 1 addition & 1 deletion tests/24 - fpm resolve_conflict use-ours/input/index.ftd
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-- ftd.text: Hello world4
-- ftd.text: Hello world4
2 changes: 1 addition & 1 deletion tests/24 - fpm resolve_conflict use-ours/output/cr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
7
8
9
10
10
2 changes: 1 addition & 1 deletion tests/25 - fpm add/input/.clone-state/cr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
12
13
14
15
15
2 changes: 1 addition & 1 deletion tests/25 - fpm add/input/.clone-state/workspace.ftd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ deleted: false

-- fpm.client-workspace: index.ftd
version: 1
deleted: false
deleted: false
2 changes: 1 addition & 1 deletion tests/25 - fpm add/input/.remote-state/history/FPM.1.ftd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- import: fpm

-- fpm.package: aviral
base: www.aviral.com
base: www.aviral.com
2 changes: 1 addition & 1 deletion tests/25 - fpm add/input/.remote-state/history/index.1.ftd
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-- ftd.text: Hello world
-- ftd.text: Hello world
2 changes: 1 addition & 1 deletion tests/25 - fpm add/input/FPM.ftd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- import: fpm

-- fpm.package: aviral
base: www.aviral.com
base: www.aviral.com
2 changes: 1 addition & 1 deletion tests/25 - fpm add/input/index.ftd
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-- ftd.text: Hello world
-- ftd.text: Hello world
2 changes: 1 addition & 1 deletion tests/25 - fpm add/input/new.ftd
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-- ftd.text: Hello my favourite company people!
-- ftd.text: Hello my favourite company people!
2 changes: 1 addition & 1 deletion tests/25 - fpm add/output/cr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
12
13
14
15
15
2 changes: 1 addition & 1 deletion tests/26 - fpm rm/input/.clone-state/cr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
2
3
4
5
5
2 changes: 1 addition & 1 deletion tests/26 - fpm rm/input/.remote-state/history/FPM.1.ftd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- import: fpm

-- fpm.package: aviral
base: www.aviral.com
base: www.aviral.com
2 changes: 1 addition & 1 deletion tests/26 - fpm rm/input/.remote-state/history/index.1.ftd
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-- ftd.text: Hello world
-- ftd.text: Hello world
2 changes: 1 addition & 1 deletion tests/26 - fpm rm/input/FPM.ftd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- import: fpm

-- fpm.package: aviral
base: www.aviral.com
base: www.aviral.com
2 changes: 1 addition & 1 deletion tests/26 - fpm rm/input/index.ftd
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-- ftd.text: Hello world
-- ftd.text: Hello world
2 changes: 1 addition & 1 deletion tests/26 - fpm rm/output/cr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
2
3
4
5
5

0 comments on commit 4917b48

Please sign in to comment.