equal
deleted
inserted
replaced
1 % initialize darcs repo |
1 % initialize darcs repo |
2 Finished recording patch 'p0' |
2 Finished recording patch 'p0' |
3 % branch and update |
3 % branch and update |
4 |
|
5 Copying patch 1 of 1... |
|
6 Copying patch 1 of 1... done. |
|
7 Finished getting. |
|
8 Finished recording patch 'p1.1' |
4 Finished recording patch 'p1.1' |
9 % update source |
5 % update source |
10 Finished recording patch 'p1.2' |
6 Finished recording patch 'p1.2' |
11 % merge branch |
7 % merge branch |
12 We have conflicts in the following files: |
8 We have conflicts in the following files: |