Skip to content

adapt the newest git #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

adapt the newest git #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion git-diffall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


# https://github.com/gfa99/git-diffall
# Perform a directory diff between commits in the repository using
# the external diff or merge tool specified in the user's config.

Expand Down Expand Up @@ -261,6 +261,10 @@ then
export BASE
eval $diff_tool '"$LOCAL"' '"$REMOTE"'
else
type initialize_merge_tool >/dev/null 2>&1
if [ $? -eq 0 ]; then
initialize_merge_tool "$merge_tool"
fi
run_merge_tool "$merge_tool" false
fi

Expand Down