equal
deleted
inserted
replaced
867 applying bar |
867 applying bar |
868 file foo already exists |
868 file foo already exists |
869 1 out of 1 hunks FAILED -- saving rejects to file foo.rej |
869 1 out of 1 hunks FAILED -- saving rejects to file foo.rej |
870 patch failed, unable to continue (try -v) |
870 patch failed, unable to continue (try -v) |
871 patch failed, rejects left in working directory |
871 patch failed, rejects left in working directory |
872 errors during apply, please fix and refresh bar |
872 errors during apply, please fix and qrefresh bar |
873 [2] |
873 [2] |
874 $ hg st |
874 $ hg st |
875 ? foo |
875 ? foo |
876 ? foo.rej |
876 ? foo.rej |
877 |
877 |