if i have a merge script that looks like:
~~~~~~~~~~ u2 ~~~~~~~~~~
#!/bin/bash
# u2
cd ~/.build/hgvim/vim
date '+%Y-%b-%d %H:%M' 2>&1 | tee -a ../update.log
if test $# -lt 1 ; then
mt=`cs`
else
mt=$1
fi
echo "about to hg merge $mt" >> ../update.log
hg merge $mt 2>&1 | tee -a ../update.log
dsh | tee -a ../update.log
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
how might i tweak it so i would see unusual messages like:
local changed src/auto/config.mk which remote deleted
use (c)hanged version or (d)elete?
what freed the script was hitting enter so i'm not sure what
option it took -- not sure it matters since i reran config
but i'm not comfortable with my script hiding messages from me
sc
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
