equal
deleted
inserted
replaced
45 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
45 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
46 adding a |
46 adding a |
47 adding b |
47 adding b |
48 diff --git a/a b/a |
48 diff --git a/a b/a |
49 new file mode 100644 |
49 new file mode 100644 |
50 examine changes to 'a'? [Ynesfdaq?] y |
50 examine changes to 'a'? |
|
51 (enter ? for help) [Ynesfdaq?] y |
51 |
52 |
52 @@ -0,0 +1,1 @@ |
53 @@ -0,0 +1,1 @@ |
53 +42 |
54 +42 |
54 record change 1/2 to 'a'? [Ynesfdaq?] y |
55 record change 1/2 to 'a'? |
|
56 (enter ? for help) [Ynesfdaq?] y |
55 |
57 |
56 diff --git a/b b/b |
58 diff --git a/b b/b |
57 new file mode 100644 |
59 new file mode 100644 |
58 examine changes to 'b'? [Ynesfdaq?] n |
60 examine changes to 'b'? |
|
61 (enter ? for help) [Ynesfdaq?] n |
59 |
62 |
60 created new head |
63 created new head |
61 continue splitting? [Ycdq?] y |
64 continue splitting? [Ycdq?] y |
62 diff --git a/b b/b |
65 diff --git a/b b/b |
63 new file mode 100644 |
66 new file mode 100644 |
64 examine changes to 'b'? [Ynesfdaq?] y |
67 examine changes to 'b'? |
|
68 (enter ? for help) [Ynesfdaq?] y |
65 |
69 |
66 @@ -0,0 +1,1 @@ |
70 @@ -0,0 +1,1 @@ |
67 +43 |
71 +43 |
68 record this change to 'b'? [Ynesfdaq?] y |
72 record this change to 'b'? |
|
73 (enter ? for help) [Ynesfdaq?] y |
69 |
74 |
70 no more change to split |
75 no more change to split |
71 |
76 |
72 $ sync |
77 $ sync |
73 |
78 |