annotate etc/spook.lines @ 87767:90318261ac4d

(smerge-refine): Also work on "same change conflicts". (smerge-makeup-conflict): New command.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 15 Jan 2008 21:40:09 +0000
parents 2139854814c1
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
70822
2139854814c1 Update.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 70809
diff changeset
1 (binary:application/octet-stream)