Index of /presentations/difficult-merges-in-git

      Name                    Last modified      Size  Description
      Parent Directory                             -   
      deploy.mk               2015-09-08 21:10  802   
      difficult-merges-in-..> 2015-09-08 21:11   54   
      dont-panic.xcf          2015-09-08 21:11  554K  
      custom.css              2015-09-08 21:12   90   
      custom.js               2015-09-08 21:12   43   
      structpres.js           2015-09-08 21:12  4.5K  
      dont-panic.png          2015-09-08 21:12  129K  
      gitk-after-abort.png    2015-09-08 21:12   43K  
      gitk.png                2015-09-08 21:12   57K  
      kdiff3.png              2015-09-08 21:12   70K  
      merge-1.svg             2015-09-08 21:13   23K  
      merge-2.svg             2015-09-08 21:13   28K  
      merge-3.svg             2015-09-08 21:13   30K  
      merge-4.svg             2015-09-08 21:13   31K  
      merge-5.svg             2015-09-08 21:13   29K  
      merge-commit.svg        2015-09-08 21:13   13K  
      merge-or-rebase.svg     2015-09-08 21:13   28K  
      rebase-commits.svg      2015-09-08 21:13   11K  
      structpres.css          2015-09-08 21:18  3.4K  
      difficult-merges-in-..> 2015-09-08 21:21   16K  
      sayings/                2018-08-20 09:01    -