git/git-mergetool--lib.sh, branch v1.7.9.2

Merge branch 'maint'

2011-09-20T03:46:48Z

* maint: git-mergetool: check return value from read

git-mergetool: check return value from read

2011-09-20T00:41:49Z

Mostly fixed already by 6b44577 (mergetool: check return value from read, 2011-07-01). Catch two uses it missed. Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano

mergetool--lib: Refactor tools into separate files

2011-08-19T07:09:19Z

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

mergetool--lib: Make style consistent with git

2011-08-19T07:09:17Z

Use the predominant conditional style where "then" appears alone on the line after the test expression. Remove spaces after ">" output redirections. Remove unnecessary parentheses around the kdiff3 commands. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

misc-sh: fix up whitespace in some other .sh files.

2011-08-05T22:04:48Z

I found that the patched 4 files were different when this filter is applied. expand -i | unexpand --first-only This patch contains the corrected files. Signed-off-by: Jon Seymour Signed-off-by: Junio C Hamano

Merge branch 'da/git-prefix-everywhere' into next

2011-06-30T00:09:27Z

* da/git-prefix-everywhere: t/t7503-pre-commit-hook.sh: Add GIT_PREFIX tests git-mergetool--lib: Make vimdiff retain the current directory git: Remove handling for GIT_PREFIX setup: Provide GIT_PREFIX to built-ins

git-mergetool--lib: Make vimdiff retain the current directory

2011-05-26T22:05:52Z

When using difftool with vimdiff it can be unexpected that the current directory changes to the root of the project. Tell vim to chdir to the value of $GIT_PREFIX to fix this. Care is taken to quote the variable so that vim expands it. This avoids problems when directory names contain spaces. Signed-off-by: David Aguilar Reported-by: Frédéric Heitzmann Signed-off-by: Junio C Hamano

Pass empty file to p4merge where no base is suitable.

2011-05-01T22:56:05Z

Modify the p4merge client command to pass a reference to an empty file instead of the local file when no base revision available. In the situation where a merge tries to add a file from one branch into a branch that already contains that file (by name), p4merge currently seems to have successfully automatically resolved the 'conflict' when it is opened (correctly if the files differed by just whitespace for example) but leaves the save button disabled. This means the user of the p4merge client cannot commit the resolved changes back to disk and merely exits, leaving the original (merge-conflicted) file intact on the disk. Provide an empty base file to p4merge so that it leaves the save button enabled. This will allow saving of the auto-resolution to disk. Signed-off-by: Ciaran Jessup Signed-off-by: Junio C Hamano

Merge branch 'ss/mergetool--lib'

2011-03-20T06:24:27Z

* ss/mergetool--lib: mergetool--lib: Add Beyond Compare 3 as a tool mergetool--lib: Sort tools alphabetically for easier lookup

mergetool--lib: Add Beyond Compare 3 as a tool

2011-02-28T20:42:38Z

Signed-off-by: Sebastian Schuberth Tested-by: Chris Packham Signed-off-by: Junio C Hamano