t / t4013 / diff.log_masteron commit git-merge: add support for branch.<name>.mergeoptions (aec7b36)
   1$ git log master
   2commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
   3Merge: 9a6d494... c7a2ab9...
   4Author: A U Thor <author@example.com>
   5Date:   Mon Jun 26 00:04:00 2006 +0000
   6
   7    Merge branch 'side'
   8
   9commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
  10Author: A U Thor <author@example.com>
  11Date:   Mon Jun 26 00:03:00 2006 +0000
  12
  13    Side
  14
  15commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
  16Author: A U Thor <author@example.com>
  17Date:   Mon Jun 26 00:02:00 2006 +0000
  18
  19    Third
  20
  21commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
  22Author: A U Thor <author@example.com>
  23Date:   Mon Jun 26 00:01:00 2006 +0000
  24
  25    Second
  26    
  27    This is the second commit.
  28
  29commit 444ac553ac7612cc88969031b02b3767fb8a353a
  30Author: A U Thor <author@example.com>
  31Date:   Mon Jun 26 00:00:00 2006 +0000
  32
  33    Initial
  34$