nant's projects / dragonfly.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 650094e) | patch
Revert "Remove mergemaster(8)."
authorSascha Wildner <saw@online.de>
Wed, 25 Jan 2012 18:35:25 +0000 (19:35 +0100)
committerSascha Wildner <saw@online.de>
Wed, 25 Jan 2012 18:35:25 +0000 (19:35 +0100)
commitc39206e83e57e94d5ce2b987d22f69c73a8f847a
tree1a981c1cb91d421dc35178b3f9514f78883b7ad5tree | snapshot
parent650094e10aa76969d99d60b3e506b55e4e2bf5fccommit | diff
Revert "Remove mergemaster(8)."

This reverts commit 650094e10aa76969d99d60b3e506b55e4e2bf5fc.

It is still being used by people.

I thought mergemaster was only useful in conjunction with maintained
CVS IDs. Should have known about its -s option.

Requested-by: pavalos
Makefile_upgrade.inc diff | blob | blame | history
usr.sbin/Makefile diff | blob | blame | history
usr.sbin/mergemaster/Makefile [new file with mode: 0644] blob
usr.sbin/mergemaster/mergemaster.8 [new file with mode: 0644] blob
usr.sbin/mergemaster/mergemaster.sh [new file with mode: 0644] blob
Nuno's DragonFly repo.