(enum conflict_resolution): Renamed from enum conflict_resolution_e.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 11 Dec 2002 06:25:26 +0000 (06:25 +0000)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 11 Dec 2002 06:25:26 +0000 (06:25 +0000)
commitf041e30b91baed171ee7423d89f5bf4361e32777
treed6bdf72b0903c9fd822ef4b17ff7e5c1ec132298
parent41f83caf1cbad0e79f7fcd3e35386a523e463784
(enum conflict_resolution): Renamed from enum conflict_resolution_e.
src/conflicts.c