projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9618ff 668f26f)
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)
* mv/merge-refresh:
  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
Git—the stupid content tracker