git/git-mergetool.sh, branch v2.11.2

mergetool: honor -O

2016-10-11T17:04:31Z

Teach mergetool to pass "-O" down to `git diff` when specified on the command-line. Helped-by: Johannes Sixt Signed-off-by: David Aguilar Reviewed-by: Johannes Sixt Signed-off-by: Junio C Hamano

mergetool: honor diff.orderFile

2016-10-11T17:04:27Z

Teach mergetool to get the list of files to edit via `diff` so that we gain support for diff.orderFile. Suggested-by: Luis Gutierrez Helped-by: Johannes Sixt Signed-off-by: David Aguilar Reviewed-by: Johannes Sixt Signed-off-by: Junio C Hamano

mergetool: move main program flow into a main() function

2016-10-11T17:04:23Z

Make it easier to follow the program's flow by isolating all logic into functions. Isolate the main execution code path into a single unit instead of having prompt_after_failed_merge() interrupt it partyway through. The use of a main() function is borrowing a convention from C, Python, Perl, and many other languages. This helps readers more familiar with other languages understand the purpose of each function when diving into the codebase with fresh eyes. Signed-off-by: David Aguilar Reviewed-by: Johannes Sixt Signed-off-by: Junio C Hamano

mergetool: add copyright

2016-10-11T17:04:10Z

Signed-off-by: David Aguilar Reviewed-by: Johannes Sixt Signed-off-by: Junio C Hamano

Merge branch 'nf/mergetool-prompt'

2016-05-03T21:08:17Z

UI consistency improvements. * nf/mergetool-prompt: difftool/mergetool: make the form of yes/no questions consistent

difftool/mergetool: make the form of yes/no questions consistent

2016-04-25T22:15:17Z

Every yes/no question in difftool/mergetool scripts has slightly different form, and none of them is consistent with the form git itself uses. Make the form of all the questions consistent with the form used by git. Reviewed-by: John Keeping Signed-off-by: Nikola Forró Acked-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool: honor tempfile configuration when resolving delete conflicts

2016-03-10T22:07:57Z

Teach resolve_deleted_merge() to honor the mergetool.keepBackup and mergetool.keepTemporaries configuration knobs. This ensures that the worktree is kept pristine when resolving deletion conflicts with the variables both set to false. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool: support delete/delete conflicts

2016-03-10T22:07:13Z

If two branches each move a file into different directories then mergetool will fail because it assumes that the file being merged, and its parent directory, are present in the worktree. Create the merge file's parent directory to allow using the deleted base version of the file for merge resolution when encountering a delete/delete conflict. The end result is that a delete/delete conflict is presented for the user to resolve. Reported-by: Joe Einertson Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool--lib: set IFS for difftool and mergetool

2015-05-20T20:13:42Z

git-sh-setup sets IFS but it is not used by git-difftool--helper. Set IFS in git-mergetool--lib so that the mergetool scriptlets, difftool, and mergetool do not need to do so. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool: simplify conditionals

2014-11-21T19:27:53Z

Combine the $last_status checks into a single conditional. Replace $last_status and $rollup_status with a single variable. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano