| commit | 7b937ca33142ff5ecc655f2be61678a512352122 | |
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Sat, 16 Apr 2005 19:05:45 +0000 (16 12:05 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Sat, 16 Apr 2005 19:05:45 +0000 (16 12:05 -0700) | ||
| tree | cf88c1fea1b31ac3c7a9606681672c64d4140b79 | treesnapshot (tar.gz zip) |
| parent | 43f91266a493c4888b4ff2a7997ccc4a381e7238 | commitdiff |
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.
This allows you to actually tell git that you've resolved a conflict.
| read-cache.c | diffblobblamehistory |