]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2dc622 17cd29b)
Merge branch 'jc/merge-symlink' into maint
authorJunio C Hamano <junkio@cox.net>
Mon, 26 Feb 2007 03:09:59 +0000 (19:09 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 26 Feb 2007 03:09:59 +0000 (19:09 -0800)
* jc/merge-symlink:
  merge-recursive: fix longstanding bug in merging symlinks
  merge-index: fix longstanding bug in merging symlinks


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.