Index of /presentations/merging-in-git

      Name                    Last modified      Size  Description
      Parent Directory                             -   
      structpres.js           2015-03-27 13:09  4.5K  
      structpres.css          2015-03-27 13:09  3.4K  
      merging-in-git.html     2017-01-13 05:33  8.8K  
      kdiff3.png              2015-03-27 13:09  199K  
      diverging-branches.svg  2015-03-27 13:09   62K  
      custom.js               2015-03-27 13:09   43   
      custom.css              2015-03-27 13:09   90   
      clashing-merge.png      2015-03-27 13:09   91K  
      cherry-picking.svg      2015-03-27 13:09   47K  
      before-cherry-pick-g..> 2015-03-27 13:09  115K  
      after-rebase.png        2015-03-27 13:09   92K  
      after-merge.png         2015-03-27 13:09  109K