# HG changeset patch # User Steve Losh # Date 1351980467 14400 # Node ID 22feac7bc42467a8b17c8b833bd24f36b02759a4 # Parent 3a2ab096c039516a8f43e6acd0264d8a81cd0544 Fancy up the help header. diff -r 3a2ab096c039 -r 22feac7bc424 doc/splice.txt --- a/doc/splice.txt Fri Apr 20 17:59:20 2012 +0100 +++ b/doc/splice.txt Sat Nov 03 18:07:47 2012 -0400 @@ -1,8 +1,17 @@ -*splice.txt* A plugin for resolving three-way merge conflicts. +*splice.txt* a plugin for resolving three-way merge conflicts. -Splice is a Vim plugin for resolving conflicts during three-way merges. -It's designed to be used as a merge tool for version control systems like -Mercurial, Git and Bazaar. + _____ ___ ___ _____ ~ + / ___/____ / (_)__________(_) \ ____\___ \ ~ + \__ \/ __ \/ / / ___/ _ \__ \ \ \/ __ \/ __/ ~ + ___/ / /_/ / / / /__/ __/__\ \ \ \ \_\ \ \___ ~ + /____/ .___/_/_/\___/\___/ \___/\_\_\___. \____\ ~ + /_/ \_\ ~ + + SPLICE ~ + is a Vim plugin for resolving conflicts during three-way merges. + + It's designed to be used as a merge tool for version control systems + like Mercurial, Git and Bazaar. ============================================================================== CONTENTS *Splice-contents*