git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c09c45 0b1f647)
Merge branch 'maint'
authorJunio C Hamano <redacted>
Mon, 26 Feb 2007 03:10:13 +0000 (19:10 -0800)
committerJunio C Hamano <redacted>
Mon, 26 Feb 2007 03:10:13 +0000 (19:10 -0800)
* maint:
  merge-recursive: fix longstanding bug in merging symlinks
  merge-index: fix longstanding bug in merging symlinks


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