tokkee.org

Code

projects / git.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2dc622 17cd29b)

author	Junio C Hamano <junkio@cox.net>
	Mon, 26 Feb 2007 03:09:59 +0000 (19:09 -0800)
committer	Junio 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

Git - the stupid content tracker