Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
When inserting a index entry of stage 0, remove all old unmerged entries.
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Sat, 16 Apr 2005 19:05:45 +0000
(12:05 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Sat, 16 Apr 2005 19:05:45 +0000
(12:05 -0700)
This allows you to actually tell git that you've resolved a conflict.
raw
|
patch
| inline |
side by side
(from:
7b937ca
)
No differences found