git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cdd64e fadd069)
Merge branch 'jc/merge-saner-messages'
authorJunio C Hamano <redacted>
Sun, 13 Sep 2009 08:33:15 +0000 (01:33 -0700)
committerJunio C Hamano <redacted>
Sun, 13 Sep 2009 08:33:15 +0000 (01:33 -0700)
* jc/merge-saner-messages:
  merge-recursive: give less scary messages when merge did not start


Trivial merge
git clone https://git.99rst.org/PROJECT