![[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) |
* mv/merge-refresh:
builtin-merge: refresh the index before calling a strategy
builtin-merge: refresh the index before calling a strategy
| 1 | 2 | |||
|---|---|---|---|---|
| builtin-merge.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin-merge.c
Simple merge