4 ; Who are you?

     4 ; Who are you?

     5 username = Oleksandr Gavenko <gavenkoa@gmail.com>

     5 username = Oleksandr Gavenko <gavenkoa@gmail.com>

     6 ; Use internal merge engine. When merge fail you see <<<<<< ====== >>>>>> and a .orig file.

     6 ; Use internal merge engine. When merge fail you see <<<<<< ====== >>>>>> and a .orig file.

     7 merge = internal:merge

     7 merge = internal:merge

     8 editor = emacs -q

     8 editor = emacs -q

     9 

    10 

    10 [defaults]

    11 [defaults]

    11 log = -v

    12 log = -v

    12 incoming = -v

    13 incoming = -v

    13 outgoing = -v

    14 outgoing = -v