mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
98901c4f4d
The CR characters of darcs get confused the output. Additionally this darcs version printed: darcs: <stdin>: hGetLine: end of file
30 lines
579 B
Plaintext
30 lines
579 B
Plaintext
% initialize darcs repo
|
|
Finished recording patch 'p0'
|
|
% branch and update
|
|
Finished recording patch 'p1.1'
|
|
% update source
|
|
Finished recording patch 'p1.2'
|
|
% merge branch
|
|
We have conflicts in the following files:
|
|
./a
|
|
Finished pulling and applying.
|
|
Finished recording patch 'p2'
|
|
initializing destination darcs-repo-hg repository
|
|
scanning source...
|
|
sorting...
|
|
converting...
|
|
3 p0
|
|
2 p1.2
|
|
1 p1.1
|
|
0 p2
|
|
o 3 "p2" files: a
|
|
|
|
|
o 2 "p1.1" files:
|
|
|
|
|
o 1 "p1.2" files: a b
|
|
|
|
|
o 0 "p0" files: a
|
|
|
|
7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a
|
|
1e88685f5ddec574a34c70af492f95b6debc8741 644 b
|