You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

7 lines
172 B

  1. # merger hooks, run tools/hooks/install.bat or install.sh to set up
  2. *.dmm merge=dmm
  3. *.dmi merge=dmi
  4. # force changelog merging to use union
  5. html/changelog.html merge=union