]> Pileus Git - ~andy/git/commitdiff
projects / ~andy / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5be297 e45bda8)
Merge branch 'maint-1.8.2' into maint-1.8.3
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Sep 2013 21:24:52 +0000 (14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Sep 2013 21:24:52 +0000 (14:24 -0700)
* maint-1.8.2:
  Documentation/git-merge.txt: fix formatting of example block

1  2 
Documentation/git-merge.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-merge.txt
Simple merge
Andy's Git repository