Fernando Ramos <greenfoo@xxxxxx> writes: > Create a new test case file for the different available merge tools. > Right now it only tests the 'mergetool.vimdiff.layout' option. Other > merge tools might be interested in adding their own tests here too. > > Signed-off-by: Fernando Ramos <greenfoo@xxxxxx> > --- .git/rebase-apply/patch:21: trailing whitespace. . $GIT_BUILD_DIR/mergetools/vimdiff && .git/rebase-apply/patch:26: new blank line at EOF. +
