Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mv/merge-refresh'
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
1
2
builtin-merge.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
c9618ff
668f26f
)
diff --cc
builtin-merge.c
Simple merge