From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sat, 16 Apr 2005 19:05:45 +0000 (-0700)
Subject: When inserting a index entry of stage 0, remove all old unmerged entries.
X-Git-Tag: v0.99~866
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/7b937ca33142ff5ecc655f2be61678a512352122?hp=7b937ca33142ff5ecc655f2be61678a512352122

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.
---