diff src/org/tmatesoft/hg/internal/FileUtils.java @ 705:b4242b7e7dfe

Merge command: implement conflict resolution alternatives
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Thu, 15 Aug 2013 18:43:50 +0200
parents 24f4efedc9d5
children 42b88709e41d
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/internal/FileUtils.java	Wed Aug 14 20:07:26 2013 +0200
+++ b/src/org/tmatesoft/hg/internal/FileUtils.java	Thu Aug 15 18:43:50 2013 +0200
@@ -105,7 +105,7 @@
 		fos.flush();
 		fos.close();
 	}
-
+	
 	public void closeQuietly(Closeable stream) {
 		closeQuietly(stream, null);
 	}
@@ -126,4 +126,9 @@
 			}
 		}
 	}
+
+	// nothing special, just a single place with common prefix
+	public File createTempFile() throws IOException {
+		return File.createTempFile("hg4j-", null);
+	}
 }