![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 9 Oct 2008 17:19:23 +0000 (10:19 -0700) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 9 Oct 2008 17:19:23 +0000 (10:19 -0700) | ||
| commit | 76c3fb1f844753c4186975a483943e1970b3c4e2 | |
| tree | 3c454310228d1c2500fbb38c5b78eb473766680a | tree | snapshot |
| parent | c9618ff939aeb5e895d90c2478db989038eccc26 | commit | diff |
| parent | 668f26fff610605d112fbedffae79917de948893 | commit | diff |
Merge branch 'mv/merge-refresh'
* mv/merge-refresh:
builtin-merge: refresh the index before calling a strategy
* mv/merge-refresh:
builtin-merge: refresh the index before calling a strategy
| builtin-merge.c | diff1 | | diff2 | | blob | history |