ELF>*@@ eHEL9rlIM;wTID$II$LH޸ID$HCHHEID$HEAHIDžAeHEL9rlIM;wTID$II$LH޸ID$HCHHEID$HEAHIDžAeHEL9rlIM;wTID$II$LH޸ID$HCHHEID$HEAHIDžAeHEL9rlIM;wTID$II$LH޸ID$HCHHEID$HEAHIDžAeHEL9rHEH]LsHAeD IM;wID$I$I\$HeIDžAeHEL9rQIM;w9HEH]ID$HCI$AIt$HEHIDžAef H['LuHuH H]H[HEHHu# HEL9r"HCHELHEHHu#AeI(M;w@ID$Mt$ID$ID$I$AAML$IDž(AeHEL9rHEH]LsHAeD IM;wID$I$I\$HeIDžAeHEL9rQIM;w9HEH]ID$HCI$AIt$HEHIDžAef H['LuHuH H]H[HEHHu# HEL9r"HCHELHEHHu#AeI(M;w@ID$Mt$ID$ID$I$AAML$IDž(AeHEL9rlIM;wTID$II$LH޸ID$HCHHEID$HEAHIDžAeHEL9rlIM;wTID$II$LH޸ID$HCHHEID$HEAHIDžAeHEL9rlIM;wTID$II$LH޸ID$HCHHEID$HEAHIDžAeHEL9rlIM;wTID$II$LH޸ID$HCHHEID$HEAHIDžAeHEL9rlIM;wTID$II$LH޸ID$HCHHEID$HEAHIDžAeHEL9r|IM;wdID$II$LH޸ID$HCHHEID$HEAAHIDžAeC HEH;Ct H]H LuH @ HCHEHEHHu#@ HEHEHEIHEH@ H]HCHELsHEHHEL9rLHEHHu#Ae@C HEH;Ct H]H LuH @ HCHEHEHHu#@ HEHEHEIHEH@ H]HCHELsHEHHEL9rLHEHHu#Ae@HEL9rHEH]LsHAefHEL9rHEH]LsHAefHEL9rHEH]LsHAefHEL9rHEH]LsHAef HHHs HeHeHEL9r,HEH]AH{HEHAe HHHs HeHeHEL9r,HEH]AH{HEHAe HEL9r5HC?HEHCHEHC7HELsHsH{LC'LK/HAefD He@ IHM;wlID$HE@ID$HE8ID$HE0ID$HE(ID$HE ID$HEID$HEID$HEI$I\$AHE@H@IDžHIE@ HEL9ruHC?HEHC7HEHC/HEHC'HEHCHEHCHEHCHEHCHEHC?HEHC7HELsHsH{LC'LK/HEHŨAefD AH? IHM;wRID$HEPID$HEHID$I\$Mt$It$I|$MD$HEI$Mt$HEPHPIDžHHEIE@ HEL9r5HCHEHCHEHC?HELsHsH{'LC/LK7HAefD He@ IHM;wlID$HE@ID$HE8ID$HE0ID$HE(ID$HE ID$HEID$HEID$HEI$I\$AHE@H@IDžHIE@ HC'HEHCHEHCHEHCHEHCHEHEHEHC'HELuHsH{LCLKHEH HEL9r7HCHEHCHEHCHEH[HEHHB#Ae@ AH? I(M;w>ID$HEPID$HEHID$HEID$I$Mt$HEPHPIDž(HEIE@D AHHfDHEL9r%HEH]LsHsHEHAefD HEL9rhI M;wPID$HCID$HCGI$ID$HEHCHEHC?HELsHsH{'LC/LK7HIDž Ae IPM;wiID$HCID$HCID$HCID$HCID$HC'ID$HC/ID$HC7ID$HC?ID$HCGI$I\$AIDžPAe?  H]@HE/? s IPM;wrID$HEPID$HEHID$HE@ID$HE8ID$HE0ID$HE(ID$HE ID$HEID$HEI$H{yu!I\$HEqIDžPAeID$HE@HE HEH## ?:AAAHE ?zHHHs!H]AHEH]8Lu0Hu(H} LE ?zH]HEHu# ?zfD ?zHEfD ?HHHsnAHE ?HCHEH[HEHHu#D ?Lu@HHE@ ?H]HEHELu8Hu(H} LELMHEH HC'HEHCHEHCHEHEHC'HEHCHEHCHELu HuHCHEH}HCHELCLKHEH HEL9rFHC&HEHCHEHCHEHCHEHCHELHEHH##AeD IM;IDŽ$HM$XIDŽ$`I$HI$pIDŽ$xI$`ID$ID$I$xID$ID$HCID$ID$HCID$ID$HCID$Mt$ID$ID$ID$ID$ID$I$I\$eIDžAefD HHHsCI M;wDID$HEID$ID$ID$I$LuIt$HHIDž Ae HEL9r"LuHHEHHG#Ae@HEL9rlIM;wTID$II$LH޸ID$HCHHEID$HEAHIDžAeHEL9rqIM;wYID$II$LH޸ID$HCHHEID$HEAHIDžAefHEL9rqIM;wYID$II$LH޸ID$HCHHEID$HEAHIDžAefHEL9rqIM;wYID$II$LH޸ID$HCHHEID$HEAHIDžAefHEL9rlIM;wTID$II$LH޸ID$HCHHEID$HEAHIDžAeH<%H%HHEHHEHHEHHEHHEHHEHHEHHEHHEHHEHHEHHEHHEHHEHefDidl Finished marking conflicts.Jun 22 201114:41:09src/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.3.symtab.strtab.shstrtab.rela.text.rela.data.bss.rodata.note.GNU-stack.comment @= xap + & 1%6%>B*N0B* M*W-  XD 0$(2= GHUP`0jhxx@(xhx "0X;FP[8fq|8`X(8(8X* 5x?MX XP c n y     `   X   P +6@AhL WbmxH`x8hP(3(>XIxT_j0u`@`p@(&0>IS axku#E\cw=P~xe W   3     i     - M t    ]    1|RPH%j8p6mV"KTb@} >@HX-h*lh?^{1f2o8 r55th_closurer55th_infoc55yC_strr55tj_closurer55tj_infoc55z4_strr55tl_closurer55tl_infoc55zw_strr55tn_closurer55tp_closurer55tp_infoc55A3_strr55tr_srtr55tr_closurer55tr_infos55Ao_infoc55AV_strs55u6_infos55u7_infos55Aq_infos55um_infos55Ax_infor55tt_closurer55tv_srtr55tv_closurer55tv_infos55C9_infoc55CH_strs55uu_infos55uv_infos55Cb_infos55uK_infos55Ci_infor55tx_closurer55tx_infoc55DY_strr55tz_closurer55tz_infoc55Eq_strr55tB_closurer55tB_infoc55ES_strc55FE_strc55G6_strr55tD_closurer55tF_srtr55tF_closurer55tF_infor55tH_srtr55tH_closurer55tH_infos55GX_infos55GY_infos55GZ_infos55v6_infor55tJ_srtr55tJ_closurer55tJ_infos55Ic_infos55Id_infos55Ie_infos55vq_infos55vA_infos55vC_infos55vE_infos55vG_infos55Jr_infos55vJ_infos55Js_infos55vM_infos55JA_infos55Jz_infos55Jt_infos55JD_infos55JC_infos55wK_infos55JJ_infos55JI_infos55JF_infos55JG_infos55JM_infos55JL_infos55xj_infos55JO_infos55JV_infos55JW_infos55xI_infos55JX_infos55JY_infos55K1_infos55JP_infos55JQ_infos55JR_infos55xC_infos55y0_infos55K5_infos55K6_infos55K3_infos55Ju_infos55Jv_infos55Jw_infos55Jx_infos55K9_infos55Ka_infos55Jq_infor55tL_closurer55tN_closurer55tN_infoc55V1_strr55tP_closurer55tR_srtr55tR_closurer55tR_infoc55VA_strr55tT_closurer55tV_srtr55tV_closurer55tV_infoc55W9_strr55tX_closurec55WI_strc55Xa_str_module_registereddarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflicts4_closuredarcszmbetazm2zi7zi98zi1_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_closuredarcszmbetazm2zi7zi98zi1_DarcsziBug_zubugDoc1_closurestg_upd_frame_infobase_GHCziIOziException_zdwzdcshowsPrec2_infodarcszmbetazm2zi7zi98zi1_Printer_S_con_infobase_GHCziBase_unpackAppendCStringzh_infostg_ap_pp_fastdarcszmbetazm2zi7zi98zi1_DarcsziBug_zubugDoc1_infodarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflicts1_closureghczmprim_GHCziTypes_ZC_static_infodarcszmbetazm2zi7zi98zi1_DarcsziArguments_umaskOption_closuredarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflicts3_closuredarcszmbetazm2zi7zi98zi1_DarcsziArguments_workingRepoDir_closuredarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflicts2_closuredarcszmbetazm2zi7zi98zi1_DarcsziArguments_ignoretimes_closuredarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflicts6_closuredarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflicts7_closuredarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflicts7_infodarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflicts8_closuredarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflicts8_infodarcszmbetazm2zi7zi98zi1_DarcsziBug_zuimpossible1_closuredarcszmbetazm2zi7zi98zi1_DarcsziBug_zuimpossible1_infobase_GHCziIOziException_zdfExceptionIOException1_closurestg_raisezhstg_ap_p_infobase_DataziTypeable_typeOf_infobase_GHCziException_zdp1Exception_infodarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflicts5_srtbase_GHCziIOziHandleziFD_stdout_closurebase_GHCziIOziHandleziText_hPutStr2_closuredarcszmbetazm2zi7zi98zi1_DarcsziSignalHandler_withSignalsBlocked1_closurebase_SystemziExit_exitSuccess2_closuredarcszmbetazm2zi7zi98zi1_DarcsziUtils_promptYorn2_closuredarcszmbetazm2zi7zi98zi1_DarcsziUtils_zdwa_closuredarcszmbetazm2zi7zi98zi1_DarcsziRepositoryziState_zdwa4_closuredarcszmbetazm2zi7zi98zi1_DarcsziRepositoryziInternal_withRepoLock1_closuredarcszmbetazm2zi7zi98zi1_DarcsziRepositoryziInternal_zdwa11_closuredarcszmbetazm2zi7zi98zi1_DarcsziRepositoryziInternal_zdwa2_closuredarcszmbetazm2zi7zi98zi1_DarcsziResolution_patchsetConflictResolutions_closuredarcszmbetazm2zi7zi98zi1_DarcsziRepository_zdwa_closuredarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflicts5_closuredarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflicts5_infodarcszmbetazm2zi7zi98zi1_DarcsziPatchziRepoPatch_zdp11RepoPatch_infodarcszmbetazm2zi7zi98zi1_DarcsziPatchziPrimziClass_zdp1PrimPatchBase_infodarcszmbetazm2zi7zi98zi1_DarcsziPatchziPrimziClass_zdp1PrimPatch_infodarcszmbetazm2zi7zi98zi1_DarcsziPatchziPatchy_zdp7Patchy_infodarcszmbetazm2zi7zi98zi1_DarcsziFlags_ScanKnown_closuredarcszmbetazm2zi7zi98zi1_DarcsziFlags_ScanAll_closuredarcszmbetazm2zi7zi98zi1_DarcsziFlags_zdfEqDarcsFlag_closuredarcszmbetazm2zi7zi98zi1_DarcsziFlags_LookForAdds_closurebase_GHCziList_elem_infodarcszmbetazm2zi7zi98zi1_DarcsziFlags_UseIndex_closuredarcszmbetazm2zi7zi98zi1_DarcsziFlags_IgnoreIndex_closuredarcszmbetazm2zi7zi98zi1_DarcsziFlags_IgnoreTimes_closuredarcszmbetazm2zi7zi98zi1_DarcsziFlags_DontIgnoreTimes_closuredarcszmbetazm2zi7zi98zi1_DarcsziFlags_getBoolFlag_infodarcszmbetazm2zi7zi98zi1_DarcsziRepositoryziInternal_zdwa2_infoghczmprim_GHCziUnit_Z0T_closurestg_catchzhstg_gc_utdarcszmbetazm2zi7zi98zi1_DarcsziRepository_zdwa_infoghczmprim_GHCziBool_True_closurebase_GHCziIOziHandleziText_hPutStr2_infodarcszmbetazm2zi7zi98zi1_DarcsziSignalHandler_withSignalsBlocked1_infodarcszmbetazm2zi7zi98zi1_DarcsziWitnessesziOrdered_NilFL_closuredarcszmbetazm2zi7zi98zi1_DarcsziWitnessesziOrdered_reverseRLzur_infodarcszmbetazm2zi7zi98zi1_DarcsziPatchziInvert_invertFL_infostg_raiseIOzhbase_DataziMaybe_Nothing_closuredarcszmbetazm2zi7zi98zi1_DarcsziUtils_zdwa_infodarcszmbetazm2zi7zi98zi1_DarcsziResolution_patchsetConflictResolutions_infodarcszmbetazm2zi7zi98zi1_DarcsziRepositoryziInternal_zdwa11_infodarcszmbetazm2zi7zi98zi1_DarcsziRepositoryziState_zdwa4_infodarcszmbetazm2zi7zi98zi1_DarcsziRepositoryziInternal_RepoJob_con_infodarcszmbetazm2zi7zi98zi1_DarcsziRepositoryziInternal_withRepoLock1_infostg_ap_0_fastghczmprim_GHCziTypes_Czh_static_infodarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflictsHelp_srtdarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflictsHelp_closuredarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflictsHelp_infodarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflictsDescription_closuredarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflictsDescription_infodarcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts_markconflicts_closuredarcszmbetazm2zi7zi98zi1_DarcsziCommands_DarcsCommand_static_infodarcszmbetazm2zi7zi98zi1_DarcsziRepositoryziInternal_amInHashedRepository1_closuredarcszmbetazm2zi7zi98zi1_DarcsziCommands_nodefaults1_closure__stginit_darcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts___stginit_base_ControlziMonad___stginit_base_SystemziExit___stginit_base_Prelude___stginit_darcszmbetazm2zi7zi98zi1_DarcsziPatch___stginit_darcszmbetazm2zi7zi98zi1_DarcsziWitnessesziOrdered___stginit_darcszmbetazm2zi7zi98zi1_DarcsziBug___stginit_darcszmbetazm2zi7zi98zi1_DarcsziArguments___stginit_darcszmbetazm2zi7zi98zi1_DarcsziCommands___stginit_darcszmbetazm2zi7zi98zi1_DarcsziRepository___stginit_darcszmbetazm2zi7zi98zi1_DarcsziUtils___stginit_darcszmbetazm2zi7zi98zi1_DarcsziFlags___stginit_darcszmbetazm2zi7zi98zi1_DarcsziWitnessesziSealed___stginit_darcszmbetazm2zi7zi98zi1_DarcsziSignalHandler___stginit_darcszmbetazm2zi7zi98zi1_DarcsziResolution___stginit_darcszmbetazm2zi7zi98zi1_DarcsziCommandsziMarkConflicts K fv ~      k    0 & . = @`   " / x= hJ  x x: H W x\ ia Hg (    R _ m z    8j 8x  x  H (    - {      &6 > M     (+ F V ^ m 8     x ) H (8 hx ` P `  `$  8 Xh  |      , 7  H t  x `  - e      (  ^ j     P(A P0z   @( h      J f x( 0* |  0 ((q     H : b   `( X(   @ Pp x h  ( 88T h      P  8  0 @`y  X  X  x ; H 0  ` x      X   0 B T @   X(\ t     @C ^n v       " @s    x " . 6 E l {              ' &FSq6Vv  c  -  @ }  > v  1"Ss!'GnB-@+N9 0(HPhx(Hx((HxX8`Xx(8@(HHPxX xX   (80X8X@HP`pap(a (a0@ Hh