build-lily: fix formatting
pull-all: use code from build-lily, predefine colors (28 min)
pull-all: use getopts for deleting merged branches (3 min)
pull-all: smarter stash (4 min)
pull-all: improve colors
pull-all: merge --no-ff by default, smart options (100 min)
pull-all: better error handling (5 min)
pull-all: apparently you have to specify commit to merge (2 min)
pull-all: don't die when cannot fast-forward (2 min)
pull-all: fix stash stuff (3 min)
pull-all: don't exit when branch cannot be deleted (2 min)
pull-all: less output when deleting branches (4 min)
pull-all: always begin with master (6 min)
add an alias for building lily with all experimental changes
build-lily: abort merge if it fails

Since the merge is done 'under the hood' (i.e. in detached HEAD),
we don't want to investigate it - just throw bad merge away so
that it doesn't bother us.  Keep in mind that we take care to
stash any uncommitted changes earlier, so nothing should get
intermingled with the merge.
build-lily: color merged branches
build-lily: color definitions - sort and add missing