1261 |
(setq rev1 |
(setq rev1 |
1262 |
(read-string |
(read-string |
1263 |
(format |
(format |
1264 |
"Version 1 to merge (default: %s's working version): " |
"Version 1 to merge (default %s's working version): " |
1265 |
(if (stringp file) |
(if (stringp file) |
1266 |
(file-name-nondirectory file) "current buffer"))) |
(file-name-nondirectory file) "current buffer"))) |
1267 |
rev2 |
rev2 |
1268 |
(read-string |
(read-string |
1269 |
(format |
(format |
1270 |
"Version 2 to merge (default: %s): " |
"Version 2 to merge (default %s): " |
1271 |
(if (stringp file) |
(if (stringp file) |
1272 |
(file-name-nondirectory file) "current buffer")))) |
(file-name-nondirectory file) "current buffer")))) |
1273 |
(ediff-load-version-control) |
(ediff-load-version-control) |
1293 |
(setq rev1 |
(setq rev1 |
1294 |
(read-string |
(read-string |
1295 |
(format |
(format |
1296 |
"Version 1 to merge (default: %s's working version): " |
"Version 1 to merge (default %s's working version): " |
1297 |
(if (stringp file) |
(if (stringp file) |
1298 |
(file-name-nondirectory file) "current buffer"))) |
(file-name-nondirectory file) "current buffer"))) |
1299 |
rev2 |
rev2 |
1300 |
(read-string |
(read-string |
1301 |
(format |
(format |
1302 |
"Version 2 to merge (default: %s): " |
"Version 2 to merge (default %s): " |
1303 |
(if (stringp file) |
(if (stringp file) |
1304 |
(file-name-nondirectory file) "current buffer"))) |
(file-name-nondirectory file) "current buffer"))) |
1305 |
ancestor-rev |
ancestor-rev |
1306 |
(read-string |
(read-string |
1307 |
(format |
(format |
1308 |
"Ancestor version (default: %s's base revision): " |
"Ancestor version (default %s's base revision): " |
1309 |
(if (stringp file) |
(if (stringp file) |
1310 |
(file-name-nondirectory file) "current buffer")))) |
(file-name-nondirectory file) "current buffer")))) |
1311 |
(ediff-load-version-control) |
(ediff-load-version-control) |
1411 |
(let (rev1 rev2) |
(let (rev1 rev2) |
1412 |
(setq rev1 |
(setq rev1 |
1413 |
(read-string |
(read-string |
1414 |
(format "Revision 1 to compare (default: %s's latest revision): " |
(format "Revision 1 to compare (default %s's latest revision): " |
1415 |
(file-name-nondirectory file))) |
(file-name-nondirectory file))) |
1416 |
rev2 |
rev2 |
1417 |
(read-string |
(read-string |
1418 |
(format "Revision 2 to compare (default: %s's current state): " |
(format "Revision 2 to compare (default %s's current state): " |
1419 |
(file-name-nondirectory file)))) |
(file-name-nondirectory file)))) |
1420 |
(ediff-load-version-control) |
(ediff-load-version-control) |
1421 |
(funcall |
(funcall |