1 # -*- mode: conf -*-

     1 # -*- mode: conf -*-

     6 

     2 

     7 [alias]

     3 [alias]

     8 br = branch

     4 br = branch

     9 ci = commit

     5 ci = commit

    10 co = checkout

     6 co = checkout

    59 ff = only

    55 ff = only

    60 

    56 

    61 [rerere]

    57 [rerere]

    62 # Reuse Recorded Resolution. Keeps database of manually resolved conflicts.

    58 # Reuse Recorded Resolution. Keeps database of manually resolved conflicts.

    63 enabled = true

    59 enabled = true