diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 23:05:45 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 23:05:45 +0400 |
| commit | 7b937ca33142ff5ecc655f2be61678a512352122 (patch) | |
| tree | cf88c1fea1b31ac3c7a9606681672c64d4140b79 /merge-tree.c | |
| parent | 43f91266a493c4888b4ff2a7997ccc4a381e7238 (diff) | |
When inserting a index entry of stage 0, remove all old unmerged entries.
This allows you to actually tell git that you've resolved a conflict.
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions