About 112 results (0.24 seconds) 
    Google
     Custom Search
  1. EmacsWiki: Version Control
    Oct 3, 2007 ... M-x vc-resolve-conflicts -- pop up an ediff-merge session on a file with conflict
    markers. The info pages have more about it: Version Control.

    www.emacswiki.org/emacs/VersionControl
  2. EmacsWiki: Damien Elmes
    oh look, it's resolve from #emacs on the openprojects irc network! finally we have
    persuaded him to create a semi-persistent container for his thoughts!

    www.emacswiki.org/emacs/DamienElmes
  3. EmacsWiki: symlink-fix.el
    Feb 23, 1993 ... (defvar expand-file-name-resolve-symlinks-p t "*Whether expand-file-name will
    resolve symbolic links after it has been overloaded by ...

    www.emacswiki.org/emacs/symlink-fix.el
  4. EmacsWiki: xpath.el
    Oct 13, 2005 ... (apply 'append (mapcar (lambda (node) (funcall func node)) nodes))) (defun
    xpath-resolve (node xpath) "Resolve XPATH relative to NODE.

    www.emacswiki.org/emacs/xpath.el
  5. EmacsWiki: Erc Startup Files
    Sep 5, 2008 ... (autoload 'erc "erc" "" t) (de-erc-connect erc-opn "jordan.openprojects.net" 6666 "
    resolve") (de-erc-connect erc-aust "pacific.austnet.org" 6666 ...

    www.emacswiki.org/emacs/ErcStartupFiles
  6. EmacsWiki: Perforce SCM
    May 16, 2013 ... ... and want to have the full power of the Perforce client interface (changelists,
    jobs, branch specifications, status, resolve, annotate and so on).

    emacswiki.org/emacs/PerforceSCM
  7. EmacsWiki: bidi.el
    Aug 24, 2013 ... We store them in the following variables. ;; The existing categories and syntax
    tables are not enough to resolve ;; bidi issues: Some of these ...

    www.emacswiki.org/emacs/bidi.el
  8. EmacsWiki: xpath-parser.el
    Oct 13, 2005 ... ((looking-at xpath-ncname-regexp) (goto-char (match-end 0)) (skip-chars-forward
    "\x20\x9\xd\xa") ; ExprWhitespace (xpath-lex-resolve-ncname ...

    www.emacswiki.org/emacs/xpath-parser.el
  9. EmacsWiki: git-dwim.el
    ... this branch to master. * If merge is failed: continue merging (You have to
    resolve conflict merker) " (interactive) (cond ((equal (git-current-branch) "master")
     ...

    emacswiki.org/emacs/git-dwim.el
  10. EmacsWiki: Bitl Bee
    Jun 2, 2014 ... (t.co-resolve "http://t.co/AvQV2dTP") (defun t.co-resolve (url) "Resolve t.co URL by
    launching `curl --head' and parsing the result." (assert ...

    emacswiki.org/emacs/BitlBee


 

Search Tips


©2013 Google