Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>The elisp code in Viper3369's code (<a href="https://stackoverflow.com/questions/1817370/ediff-as-mergetool/4512729#4512729">Using ediff as git mergetool</a>) uses a function "display-usable-bounds" which doesn't exist. Since the hooks do a lot more than is strictly necessary, simply deleting all references to "display-usable-bounds" is sufficient to make it work for me. Good work! ;)</p> <p>(Edit: I think I should post the modified emacs-lisp code:</p> <pre><code>;; ;; Setup for ediff. ;; (require 'ediff) (defvar ediff-after-quit-hooks nil "* Hooks to run after ediff or emerge is quit.") (defadvice ediff-quit (after edit-after-quit-hooks activate) (run-hooks 'ediff-after-quit-hooks)) (setq git-mergetool-emacsclient-ediff-active nil) (setq ediff-window-setup-function 'ediff-setup-windows-plain) (setq ediff-split-window-function 'split-window-horizontally) (defun local-ediff-before-setup-hook () (setq local-ediff-saved-frame-configuration (current-frame-configuration)) (setq local-ediff-saved-window-configuration (current-window-configuration)) ;; (local-ediff-frame-maximize) (if git-mergetool-emacsclient-ediff-active (raise-frame))) (defun local-ediff-quit-hook () (set-frame-configuration local-ediff-saved-frame-configuration) (set-window-configuration local-ediff-saved-window-configuration)) (defun local-ediff-suspend-hook () (set-frame-configuration local-ediff-saved-frame-configuration) (set-window-configuration local-ediff-saved-window-configuration)) (add-hook 'ediff-before-setup-hook 'local-ediff-before-setup-hook) (add-hook 'ediff-quit-hook 'local-ediff-quit-hook 'append) (add-hook 'ediff-suspend-hook 'local-ediff-suspend-hook 'append) ;; Useful for ediff merge from emacsclient. (defun git-mergetool-emacsclient-ediff (local remote base merged) (setq git-mergetool-emacsclient-ediff-active t) (if (file-readable-p base) (ediff-merge-files-with-ancestor local remote base nil merged) (ediff-merge-files local remote nil merged)) (recursive-edit)) (defun git-mergetool-emacsclient-ediff-after-quit-hook () (exit-recursive-edit)) (add-hook 'ediff-after-quit-hooks 'git-mergetool-emacsclient-ediff-after-quit-hook 'append) </code></pre>
    singulars
    1. This table or related slice is empty.
    1. POUsing ediff as git mergetool
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USCommunity
    1. USTauPan
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COLinkified the url.
      singulars
      1. PO
      1. USalternative
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload