Senthil Kumaran <sent...@uthcode.com> added the comment: 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. ---------- _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue12255> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
