Skip to content
Snippets Groups Projects
  1. Jan 30, 2012
  2. Jan 29, 2012
  3. Jan 28, 2012
  4. Jan 27, 2012
  5. Jan 28, 2012
  6. Jan 27, 2012
  7. Jan 28, 2012
  8. Jan 27, 2012
  9. Jan 26, 2012
  10. Jan 27, 2012
    • Matt Mackall's avatar
      merge: defer symlink flag merging to filemerge (issue3200) · fcf66193b186
      Matt Mackall authored
      Previously, we could change a normal file into a corrupt symlink when
      trying to merge a symlink flag. Now, we leave the flag alone and let
      filemerge deal with it (usually by a prompt).
      
      We also drop a redundant flag setting after filemerge (now dealt with
      by ms.resolve) that would cause similar corruption.
      fcf66193b186
  11. Jan 26, 2012
  12. Jan 25, 2012
  13. Jan 23, 2012
  14. Jan 25, 2012
  15. Jan 24, 2012
  16. Jan 25, 2012
Loading