Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful.
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 14 Apr 2005 08:37:23 +0000 (01:37 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 14 Apr 2005 08:37:23 +0000 (01:37 -0700)
commit33deb63a36f523c513cf29598d9c05fe78a23cac
tree298e5d544d67bcc11e95aa6b04f1069a9cd959e6
parent458754a9fe2c2e889e38d1f4f53d5d457eba6faa
Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful.

It only works one directory level at a time, so lookout..
Makefile
merge-tree.c [new file with mode: 0644]