Junio C Hamano b5699d17c3 Merge branch 'maint-1.8.3' into maint
* maint-1.8.3:
  Documentation/git-merge.txt: fix formatting of example block
2013-09-05 14:24:59 -07:00
..
2013-07-29 12:32:25 -07:00
2013-08-01 12:01:01 -07:00
2013-07-22 16:06:48 -07:00
2013-02-14 10:29:01 -08:00
2013-06-30 15:45:43 -07:00
2012-06-19 11:35:19 -07:00
2013-04-12 12:00:52 -07:00
2011-09-06 11:42:12 -07:00
2013-05-29 14:23:04 -07:00
2013-04-12 12:00:52 -07:00
2013-07-22 16:06:48 -07:00
2013-03-25 14:00:29 -07:00
2011-03-11 10:59:16 -05:00
2013-04-12 12:00:52 -07:00
2013-08-23 11:49:46 -07:00
2013-06-09 13:45:32 -07:00
2013-07-22 16:06:48 -07:00
2013-07-22 11:34:25 -07:00