Merge branch 'mv/merge-refresh'
authorShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 17:19:23 +0000 (10:19 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 9 Oct 2008 17:19:23 +0000 (10:19 -0700)
commit76c3fb1f844753c4186975a483943e1970b3c4e2
tree3c454310228d1c2500fbb38c5b78eb473766680a
parentc9618ff939aeb5e895d90c2478db989038eccc26
parent668f26fff610605d112fbedffae79917de948893
Merge branch 'mv/merge-refresh'

* mv/merge-refresh:
  builtin-merge: refresh the index before calling a strategy
builtin-merge.c