hgmerge: logic changes
Details:
- keep automatic merge conflicts in $LOCAL
- do not assume that $EDITOR returns proper error code
- fix a slight mistake in diff+patch merge success detection
(it could succeed if the $EDITOR failed to run)
SOURCES=$(wildcard *.[0-9].txt)
MAN=$(SOURCES:%.txt=%)
HTML=$(SOURCES:%.txt=%.html)
all: man html
man: $(MAN)
html: $(HTML)
%: %.xml
xmlto man $*.xml
%.xml: %.txt
asciidoc -d manpage -b docbook $*.txt
%.html: %.txt
asciidoc -b html4 $*.txt || asciidoc -b html $*.txt
clean:
$(RM) $(MAN) $(MAN:%=%.xml) $(MAN:%=%.html)