Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg rebase -s c21b61c40139 -d E
- abort: uncommitted changes
- rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg rebase -s 6e1A2LcpW0g -d E
- abort: uncommitted changes
- rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg rebase --continue
- abort: no rebase in progress
- rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg up c21b61c40139
- merging browser/themes/shared/identity-block/identity-block.inc.css
- output file browser/themes/shared/identity-block/identity-block.inc.css appears unchanged
- was merge successful (yn)? n
- merging browser/themes/shared/identity-block/identity-block.inc.css failed!
- 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
- use 'hg resolve' to retry unresolved file merges
- rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg up c21b61c40139
- abort: outstanding merge conflicts
- rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg resolve
- abort: no files or directories specified
- (use --all to re-merge all unresolved files)
- rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg up 0650d36649e5
- abort: outstanding merge conflicts
- rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg resolve c21b61c40139
- arguments do not match paths that need resolving
- rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg rebase c21b61c40139
- hg rebase: invalid arguments
- rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg rebase -d master
- abort: uncommitted changes
Add Comment
Please, Sign In to add comment