merge-recursive: clarify code in was_tracked()

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 89e967abece8329cb6a79140f6ca1a6a63bf1d07..308eafd1d38422ce5e9d4c8d90050a28795479f9 100755 (executable)
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -5,16 +5,11 @@
 # Resolve two or more trees.
 #
 
-. git-sh-i18n
+. git-sh-setup
 
 LF='
 '
 
-die () {
-    echo >&2 "$*"
-    exit 1
-}
-
 # The first parameters up to -- are merge bases; the rest are heads.
 bases= head= remotes= sep_seen=
 for arg