##// END OF EJS Templates
rebase: avoid redundant merges (issue1301)
rebase: avoid redundant merges (issue1301)

File last commit:

r7271:8046f0a0 default
r7278:45495d78 default
Show More
test-mq-qimport.out
24 lines | 537 B | text/plain | TextLexer
% qimport non-existing-file
abort: No such file or directory:
% import URL
adding url.diff to series file
url.diff
% import patch that already exists
abort: patch "url.diff" already exists
applying url.diff
Now at: url.diff
foo
Patch queue now empty
% qimport -f
adding url.diff to series file
applying url.diff
Now at: url.diff
foo2
Patch queue now empty
% build diff with CRLF
adding b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% qimport CRLF diff
adding b.diff to series file
applying b.diff
Now at: b.diff