From bc7a96a8965d4ce0651689301e1702a942dfb9f0 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Thu, 18 Aug 2011 00:23:46 -0700 Subject: mergetool--lib: Refactor tools into separate files Individual merge tools are now defined in a mergetools/$tool file which is sourced at runtime. The individual files are installed into $(git --exec-path)/mergetools/. New tools can be added by creating a new file instead of editing the git-mergetool--lib.sh scriptlet. http://thread.gmane.org/gmane.comp.version-control.git/134906/focus=135006 Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- mergetools/emerge | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 mergetools/emerge (limited to 'mergetools/emerge') diff --git a/mergetools/emerge b/mergetools/emerge new file mode 100644 index 0000000000..f96d9e550a --- /dev/null +++ b/mergetools/emerge @@ -0,0 +1,23 @@ +diff_cmd () { + "$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE" +} + +merge_cmd () { + if $base_present + then + "$merge_tool_path" \ + -f emerge-files-with-ancestor-command \ + "$LOCAL" "$REMOTE" "$BASE" \ + "$(basename "$MERGED")" + else + "$merge_tool_path" \ + -f emerge-files-command \ + "$LOCAL" "$REMOTE" \ + "$(basename "$MERGED")" + fi + status=$? +} + +translate_merge_tool_path() { + echo emacs +} -- cgit v1.2.3