X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke.git;a=blobdiff_plain;f=topbloke-merge-driver;h=a3d199920bac4a2e952859b9562886aac5a94338;hp=891bfa4ca919c873240369881cff53e1e316473a;hb=e0dce6d313d0ee510f00238de8abda944f8d6155;hpb=494c30db6e5fd21d19e8dfc9a10fd37fe46529d0

diff --git a/topbloke-merge-driver b/topbloke-merge-driver
index 891bfa4..a3d1999 100755
--- a/topbloke-merge-driver
+++ b/topbloke-merge-driver
@@ -4,7 +4,8 @@ set -e
 fail () { echo >&2 "$0: $*"; exit 127; }
 
 case "$1" in
---v1) how=tip ;;		# merge into tip from another tip of this patch
+--v1) how=same ;;		# merge into tip from another tip of this patch
+				#  or into base from another base of this patch
 --v1-base) how=base ;;		# merge into tip from a base of this patch
 --v1-dep) how=dep ;;		# merge into base from a dep's tip
 *) fail "bad usage" ;;
@@ -31,13 +32,13 @@ base.deps)
 base.props)
 	exec topbloke-merge-lists -M$markersize -P -UDeleted "$@"
 	;;
-tip.msg)
+same.msg)
 	exec git-merge-file --marker-size=$markersize "$@"
 	;;
-tip.deps|*.included)
+same.deps|*.included)
 	exec topbloke-merge-lists -M$markersize "$@"
 	;;
-tip.props|*.pprops)
+same.props|*.pprops)
 	exec topbloke-merge-lists -M$markersize -P "$@"
 	;;
 *)