Skip to content
Snippets Groups Projects
  1. May 25, 2014
  2. May 10, 2014
  3. May 09, 2014
  4. Apr 25, 2014
  5. May 16, 2014
  6. May 08, 2014
    • Durham Goode's avatar
      rebase: specify custom conflict marker labels for rebase (BC) · 3b40e32e88c3
      Durham Goode authored
      Changes rebase conflict markers to say 'source' and 'dest' instead of
      'local' and 'other'.  This ends up looking like:
      
        one
        <<<<<<< dest:   a3e5c7fd master - bob: "A commit to master"
        master
        =======
        mine
        >>>>>>> source: c7fda3e5 - durham: "A commit to my feature branch"
        three
      3b40e32e88c3
  7. May 10, 2014
  8. May 08, 2014
  9. Apr 22, 2014
  10. May 08, 2014
    • Durham Goode's avatar
      merge: add conflict marker formatter (BC) · 25d5a9ecbb85
      Durham Goode authored
      Adds a conflict marker formatter that can produce custom conflict marker
      descriptions. It can be set via ui.mergemarkertemplate. The old behavior
      can be used still by setting ui.mergemarkers=basic.
      
      The default format is similar to:
      
        {node|short} {tag} {branch} {bookmarks} - {author}: "{desc|firstline}"
      
      And renders as:
      
        contextblahblah
        <<<<<<< local: c7fdd7ce4652 - durham: "Fix broken stuff in my feature branch"
        line from my changes
        =======
        line from the other changes
        >>>>>>> other: a3e55d7f4d38  master - sid0: "This is a commit to master th...
        morecontextblahblah
      25d5a9ecbb85
  11. Apr 22, 2014
  12. Mar 07, 2013
  13. Apr 22, 2014
    • Gregory Szorc's avatar
      run-tests: pass a full test path into Test.__init__ · f8515564d617
      Gregory Szorc authored
      Previously, a Test's path came from the base directory of all tests and
      a filename leaf. There is not a strong reason why an absolute test path
      can not be specified.
      
      This change isn't strictly necessary. But it does enable scenarios such
      as more easily running tests from multiple, non-sibling directories.
      f8515564d617
  14. Apr 21, 2014
Loading