ELFx4( eE;CTrM;{\w>GC`VSGFEGEECpcE;CTrM;{\w>GC`VSGFEGEECpcE;CTrM;{\w>GC`VSGFEGEE(CpcE;CTrM;{\w>GC`VSGFEGEE4Cpc@E;CTrEuEFEcf ;{\wG7weCpc@E;CTrA ;{\w2EuGFGEEXECp c vEMME uvEXu&f E;CTrENMExu&cf<E;CTrR;{\wCGEGGGGEEE$E5E<Cp`cfdE;CTrEuEFEcf ;{\wG7weCpcdE;CTrA ;{\w2EuGLFGEEECp c vEMME uvEu&f E;CTrENME$u&cf`E;CTrR;{\wCGEGGLGGEEE$EiE<CpcfE;CTrM;{\w>GC`VSGFEGEECpcE;CTrM;{\w>GC`VSGFEGEECpcE;CTrM;{\w>GC`VSGFEGEECpcE;CTrM;{\w>GC`VSGFEGEECpcE;CTrM;{\w>GC`VSGFEGEE CpcE;CTrb;{\wSGC`VSGFEGEEE$EE<Cpcv4# E;F t u m0 F EETu&0 EEEuE|0 uFEFEEf,E;CTruEu&DcD# E;F t u 9@ F EE4u&@ EEEuE\@ uFEFEEf<E;CTruEu&TcE;CTrEuFEcE;CTrEuFEcE;CTrEuFEcE;CTrEuFEc ;{\wGwEweCp C E;CTrEuFEE cf E;CTr8FEFEFEFEFEFEF EFEc e $;{\wOG8 E GEGEGEGEGE GEGEwCEE Cp$C f E;CTriFEFEFEFEFEF EFEFEFE؋FEԋFEЋFE̋FEȋF EċFEEܜ c EEEv $;{\wHG E8GE4GwEGEGEGE GEGE4E8 4Cp$E C f E;CTr8F EFEFEFEFEFEFEFEc e $;{\wOG@ E GEGEGEGEGE GEGEwCEE Cp$C f FEFEF EFEFEEEFEFEF E܋FE؋FEԋEEE  E;CTr-F EFEFEvE e&c EEEv ;{\w0G E(GE$GEG7GE$E( $CpE C f uEfE;CTr%EuF EFEEPc E;CTrY;{\wJGlF GF#GEFEFEFEFEFEFEFECpc (;{\wKGܬFGFGF GFGFGFGFGFGF#wCUCp(cv cv u Eq 3v (;{\wQG E(GE$GE GEGEGEGEGE GE~yuwECp(cG݉E Ef Ee&v EEEEEEXf(J s'uEEEE|E EEEEEEEu4 uEu&@ fL E<vX sEEEELd FEvElu&vp uE EE| uEEEEE EEEEEEEEf FEFEF EFEEFEFEF EFE܋FE؋EEԋFEE EEf E;CTr5FEF EFEENME<U&c P;{\whG EGG< GGGh GGGؔ G̉GG FGGFGEGG؉GGweCpPcfB s/;{\w4GEGGGGE, Cpc E;CTruEu&cE;CTrM;{\w>GC`VSGFEGEE(CpcE;CTrT;{\wEGC`VSGFEGEEECpcE;CTrT;{\wEGC`VSGFEGEEECpcE;CTrT;{\wEGC`VSGFEGEEEXCpcE;CTrM;{\w>GC`VSGFEGEE`Cpc=xxEEEEEEEEEEEEEEev|i<$<d$<Tl$<`,DT?:?z?z?z?z???? x Finished marking conflicts.Jan 15 201221:55:43src/Darcs/Commands/MarkConflicts.hsProblem marking conflicts in mark-conflicts!Can't undo pending changes!Are you sure? This will trash any unrecorded changes in the working directory.No conflicts to mark.mark-conflictsdarcsAny unrecorded changes to the working tree WILL be lost forever when you run this command! You will be prompted for confirmation before this takes place. However, you might revert or manually delete these markers without actually resolving the conflict. In this case, `darcs mark-conflicts' is useful to show where any unresolved conflicts. It is also useful if `darcs apply' is called with --apply-conflicts, where conflicts aren't marked initially. v v v v v v v Initial state. ============= First choice. ************* Second choice. ^ ^ ^ ^ ^ ^ ^ Darcs requires human guidance to unify changes to the same part of a source file. When a conflict first occurs, darcs will add the initial state and both choices to the working tree, delimited by the markers `v v v', `=====', `* * *' and `^ ^ ^', as follows: Mark unresolved conflicts in working tree, for manual resolution.GHC 7.0.4.symtab.strtab.shstrtab.rel.text.rel.data.bss.rodata.note.GNU-stack.comment4 XM )|% W /t4t<L0 !UX!  (1/$2|=G$U`(j4x<<4L`XXx hp"0;LFP[fq$|LT ,*5<?DMXTc|nyLT4\ < h      +68 A L W b mx @       Pl (3>IT_jXu(|4@L<XLdlp|%0;F<Q\gr}(x$ 2X<`FxY -4H^!O{6 Z   ( w   S   t: t      E \   .UM#[; +5o1Z'cqO(M P<0@9{ Nm@uA~r5CRV_closurer5CRV_infoc5CXh_strr5CRX_closurer5CRX_infoc5CXJ_strr5CRZ_closurer5CRZ_infoc5CYb_strr5CS1_closurer5CS3_closurer5CS3_infoc5CYI_strr5CS5_srtr5CS5_closurer5CS5_infos5CZ3_infoc5CZC_strs5CSK_infos5CSL_infos5CZ5_infos5CT0_infos5CZc_infor5CS7_closurer5CS9_srtr5CS9_closurer5CS9_infos5D17_infoc5D1H_strs5CT8_infos5CT9_infos5D19_infos5CTo_infos5D1g_infor5CSb_closurer5CSb_infoc5D3f_strr5CSd_closurer5CSd_infoc5D3H_strr5CSf_closurer5CSf_infoc5D49_strc5D4V_strc5D5n_strr5CSh_closurer5CSj_srtr5CSj_closurer5CSj_infor5CSl_srtr5CSl_closurer5CSl_infos5D6e_infos5D6f_infos5D6g_infos5CTK_infor5CSn_srtr5CSn_closurer5CSn_infos5D7v_infos5D7w_infos5D7x_infos5CU4_infoc5D9A_srtdc5D9J_srtds5CUe_infos5CUg_infos5CUi_infos5CUk_infos5D8M_infos5CUr_infoc5D9T_srtds5D8U_infos5D8T_infos5D8N_infos5D8X_infos5D8W_infoc5Ddn_srtds5CVp_infos5D93_infos5D92_infos5D8Z_infos5D90_infos5D96_infos5D95_infoc5DfM_srtds5CVY_infos5D98_infos5D9f_infos5D9g_infos5CWn_infoc5DhM_srtds5D9h_infoc5DhU_srtds5D9i_infoc5Di5_srtds5D9l_infoc5Did_srtds5D99_infoc5DiL_srtds5D9a_infoc5DiW_srtds5D9b_infoc5Dj6_srtds5CWh_infoc5Djr_srtds5CWF_infoc5DjM_srtds5D9p_infoc5DjU_srtds5D9q_infoc5Dk4_srtds5D9n_infoc5Dkh_srtds5D8O_infoc5Dku_srtds5D8P_infoc5DkE_srtds5D8Q_infoc5DkY_srtds5D8R_infos5D9t_infos5D9u_infoc5Dmh_srtds5D8L_infor5CSp_closurer5CSr_closurer5CSr_infoc5Dn1_strr5CSt_closurer5CSv_srtr5CSv_closurer5CSv_infoc5DnA_strr5CSx_closurer5CSz_srtr5CSz_closurer5CSz_infoc5Do9_strr5CSB_closurec5DoI_strc5Dpa_str_module_registereddarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflicts4_closuredarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflicts4_infoghczmprim_GHCziTypes_ZMZN_closurestg_CAF_BLACKHOLE_infonewCAFstg_IND_STATIC_infostg_bh_upd_frame_infobase_GHCziBase_unpackCStringzh_infoghczmprim_GHCziTypes_Izh_static_infobase_GHCziIOziException_zdwzdcshowsPrec2_closuredarcszmbetazm2zi7zi98zi2_DarcsziBug_zubugDoc1_closurestg_upd_frame_infobase_GHCziIOziException_zdwzdcshowsPrec2_infodarcszmbetazm2zi7zi98zi2_Printer_S_con_infobase_GHCziBase_unpackAppendCStringzh_infostg_ap_pp_fastdarcszmbetazm2zi7zi98zi2_DarcsziBug_zubugDoc1_infodarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflicts1_closureghczmprim_GHCziTypes_ZC_static_infodarcszmbetazm2zi7zi98zi2_DarcsziArguments_umaskOption_closuredarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflicts3_closuredarcszmbetazm2zi7zi98zi2_DarcsziArguments_workingRepoDir_closuredarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflicts2_closuredarcszmbetazm2zi7zi98zi2_DarcsziArguments_ignoretimes_closuredarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflicts6_closuredarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflicts7_closuredarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflicts7_infodarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflicts8_closuredarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflicts8_infodarcszmbetazm2zi7zi98zi2_DarcsziBug_zuimpossible1_closuredarcszmbetazm2zi7zi98zi2_DarcsziBug_zuimpossible1_infobase_GHCziIOziException_zdfExceptionIOException1_closurestg_raisezhstg_ap_p_infobase_DataziTypeable_typeOf_infobase_GHCziException_zdp1Exception_infodarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflicts5_srtbase_GHCziIOziHandleziFD_stdout_closurebase_GHCziIOziHandleziText_hPutStr2_closuredarcszmbetazm2zi7zi98zi2_DarcsziSignalHandler_withSignalsBlocked1_closurebase_SystemziExit_exitSuccess2_closuredarcszmbetazm2zi7zi98zi2_DarcsziUtils_promptYorn2_closuredarcszmbetazm2zi7zi98zi2_DarcsziUtils_zdwa_closuredarcszmbetazm2zi7zi98zi2_DarcsziRepositoryziState_zdwa4_closuredarcszmbetazm2zi7zi98zi2_DarcsziRepositoryziInternal_withRepoLock1_closuredarcszmbetazm2zi7zi98zi2_DarcsziRepositoryziInternal_zdwa11_closuredarcszmbetazm2zi7zi98zi2_DarcsziRepositoryziInternal_zdwa2_closuredarcszmbetazm2zi7zi98zi2_DarcsziResolution_patchsetConflictResolutions_closuredarcszmbetazm2zi7zi98zi2_DarcsziRepository_zdwa_closuredarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflicts5_closuredarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflicts5_infodarcszmbetazm2zi7zi98zi2_DarcsziPatchziRepoPatch_zdp11RepoPatch_infodarcszmbetazm2zi7zi98zi2_DarcsziPatchziPrimziClass_zdp1PrimPatchBase_infodarcszmbetazm2zi7zi98zi2_DarcsziPatchziPrimziClass_zdp1PrimPatch_infodarcszmbetazm2zi7zi98zi2_DarcsziPatchziPatchy_zdp7Patchy_infoghczmprim_GHCziTuple_Z2T_con_infostg_gc_utdarcszmbetazm2zi7zi98zi2_DarcsziFlags_zdwdiffingOpts_infodarcszmbetazm2zi7zi98zi2_DarcsziRepositoryziInternal_zdwa2_infoghczmprim_GHCziUnit_Z0T_closurestg_catchzhdarcszmbetazm2zi7zi98zi2_DarcsziRepository_zdwa_infoghczmprim_GHCziBool_True_closurebase_GHCziIOziHandleziText_hPutStr2_infodarcszmbetazm2zi7zi98zi2_DarcsziSignalHandler_withSignalsBlocked1_infodarcszmbetazm2zi7zi98zi2_DarcsziWitnessesziOrdered_NilFL_closuredarcszmbetazm2zi7zi98zi2_DarcsziWitnessesziOrdered_reverseRLzur_infodarcszmbetazm2zi7zi98zi2_DarcsziPatchziInvert_invertFL_infostg_raiseIOzhbase_DataziMaybe_Nothing_closuredarcszmbetazm2zi7zi98zi2_DarcsziUtils_zdwa_infodarcszmbetazm2zi7zi98zi2_DarcsziResolution_patchsetConflictResolutions_infodarcszmbetazm2zi7zi98zi2_DarcsziRepositoryziInternal_zdwa11_infodarcszmbetazm2zi7zi98zi2_DarcsziRepositoryziState_zdwa4_infodarcszmbetazm2zi7zi98zi2_DarcsziRepositoryziInternal_RepoJob_con_infodarcszmbetazm2zi7zi98zi2_DarcsziRepositoryziInternal_withRepoLock1_infostg_ap_0_fastghczmprim_GHCziTypes_Czh_static_infodarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflictsHelp_srtdarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflictsHelp_closuredarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflictsHelp_infodarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflictsDescription_closuredarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflictsDescription_infodarcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts_markconflicts_closuredarcszmbetazm2zi7zi98zi2_DarcsziCommands_DarcsCommand_static_infodarcszmbetazm2zi7zi98zi2_DarcsziRepositoryziInternal_amInHashedRepository1_closuredarcszmbetazm2zi7zi98zi2_DarcsziCommands_nodefaults1_closure__stginit_darcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts___stginit_base_ControlziMonad___stginit_base_SystemziExit___stginit_base_Prelude___stginit_darcszmbetazm2zi7zi98zi2_DarcsziPatch___stginit_darcszmbetazm2zi7zi98zi2_DarcsziWitnessesziOrdered___stginit_darcszmbetazm2zi7zi98zi2_DarcsziBug___stginit_darcszmbetazm2zi7zi98zi2_DarcsziArguments___stginit_darcszmbetazm2zi7zi98zi2_DarcsziCommands___stginit_darcszmbetazm2zi7zi98zi2_DarcsziRepository___stginit_darcszmbetazm2zi7zi98zi2_DarcsziUtils___stginit_darcszmbetazm2zi7zi98zi2_DarcsziFlags___stginit_darcszmbetazm2zi7zi98zi2_DarcsziWitnessesziSealed___stginit_darcszmbetazm2zi7zi98zi2_DarcsziSignalHandler___stginit_darcszmbetazm2zi7zi98zi2_DarcsziResolution___stginit_darcszmbetazm2zi7zi98zi2_DarcsziCommandsziMarkConflicts /;JQ^ O[jq~!3:#7@Wa-bx")6gs'3BIV !(/Hp!(Pcj|  G s     (       }         0       g t         6Vw+j :AL[p"0@MT`{"0W!.;Hx'3BIVl&-Dco~-7AKU_is}f&Bk+o>^7cC, X     t      * |   o  (B^oFY*^5$4<LPTX\`hptx| $(,<@DLPT\`dhlptx|(4@LXdp|  0@DHLPTX\`dhlp