Message139194
| Author |
orsenthil |
| Recipients |
eric.araujo, orsenthil, r.david.murray |
| Date |
2011年06月26日.18:20:43 |
| SpamBayes Score |
0.019094449 |
| Marked as misclassified |
No |
| Message-id |
<20110626182038.GA2710@mathmagic> |
| In-reply-to |
<1309034284.2.0.0707523549856.issue12255@psf.upfronthosting.co.za> |
| Content |
On Sat, Jun 25, 2011 at 08:38:04PM +0000, Senthil Kumaran wrote:
> As I am not affected by remains of .rej and .orig (neither have I
> found their usefulness (yet)), so my concerns can be stepped over.
Just a side-note. I wondered why is my case so, and I realized that I
had integrated k3diff to handle any conflicts during merge so when a
conflict arises, it immediately invokes k3diff and it allowed me to
handle the conflicts giving me the contexts which are stored in .rej
files. |
|