Alfred Perlstein bdbca6ddeb Make mergemaster only take single letters for options as well as loop ... asking a question again if given an invalid input instead of assuming what the user wants. /etc is not the place to make assumptions when given invalid input. Reformat some of the more convoluted code into seperate functions instead of being inline using tabs instead of space indents. Allow the user to view merged files they created with sdiff. Allow the user to redisplay the diff between the installed file and the new file again. Time wasted waiting for review: 1 month 2 weeks		2000-04-02 02:47:15 +00:00
..
Makefile	`mergemaster'' was repo-copied to `mergemaster.sh'' as it's a shell script.	1999-11-01 04:29:05 +00:00
mergemaster.8	Remove single-space hard sentence breaks. These degrade the quality	2000-03-01 14:09:25 +00:00
mergemaster.sh	Make mergemaster only take single letters for options as well as loop	2000-04-02 02:47:15 +00:00