10:46:07.014277 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/bin 10:46:07.016276 git.c:749 trace: exec: git-mergetool 10:46:07.016276 run-command.c:654 trace: run_command: git-mergetool 10:46:07.062278 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.139308 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.142277 git.c:749 trace: exec: git-sh-i18n--envsubst --variables 'usage: $dashless $USAGE' 10:46:07.142277 run-command.c:654 trace: run_command: git-sh-i18n--envsubst --variables 'usage: $dashless $USAGE' 10:46:07.149277 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.168277 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.170277 git.c:749 trace: exec: git-sh-i18n--envsubst 'usage: $dashless $USAGE' 10:46:07.170277 run-command.c:654 trace: run_command: git-sh-i18n--envsubst 'usage: $dashless $USAGE' 10:46:07.178278 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.250047 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.270046 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.272046 git.c:460 trace: built-in: git config --bool mergetool.prompt 10:46:07.290046 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.290046 git.c:460 trace: built-in: git rev-parse --git-dir 10:46:07.319046 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.320046 git.c:460 trace: built-in: git rev-parse --git-path objects 10:46:07.396046 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.398046 git.c:460 trace: built-in: git config merge.tool 10:46:07.426046 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.428047 git.c:460 trace: built-in: git config mergetool.vimdiff.cmd 10:46:07.477046 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.479047 git.c:460 trace: built-in: git config --bool mergetool.keepBackup 10:46:07.504046 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.505046 git.c:460 trace: built-in: git config --bool mergetool.keepTemporaries 10:46:07.525046 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.526046 git.c:460 trace: built-in: git rev-parse --show-prefix 10:46:07.545047 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.546046 git.c:460 trace: built-in: git rev-parse --show-toplevel 10:46:07.565046 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.568047 git.c:460 trace: built-in: git rerere remaining 10:46:07.588047 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.589046 git.c:460 trace: built-in: git diff --name-only --diff-filter=U -- 'a file.txt' Merging: a file.txt 10:46:07.610866 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.612866 git.c:460 trace: built-in: git ls-files -u -- 'a file.txt' 10:46:07.640866 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.642867 git.c:460 trace: built-in: git config mergetool.vimdiff.cmd 10:46:07.682911 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.684943 git.c:460 trace: built-in: git config --bool mergetool.writeToTemp 10:46:07.791910 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.792911 git.c:460 trace: built-in: git rev-parse --show-cdup 10:46:07.859911 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.860910 git.c:460 trace: built-in: git rev-parse --show-cdup 10:46:07.925910 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.926911 git.c:460 trace: built-in: git rev-parse --show-cdup 10:46:07.959912 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.961910 git.c:460 trace: built-in: git config --type=bool mergetool.vimdiff.hideResolved 10:46:07.979910 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:07.981911 git.c:460 trace: built-in: git config --type=bool mergetool.hideResolved Normal merge conflict for 'a file.txt': {local}: modified file {remote}: modified file 10:46:08.017910 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:08.019910 git.c:460 trace: built-in: git config mergetool.vimdiff.cmd 10:46:08.071910 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:08.073910 git.c:460 trace: built-in: git config mergetool.vimdiff.path 10:46:08.109913 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:08.110910 git.c:460 trace: built-in: git config mergetool.vimdiff.cmd 10:46:08.143940 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:08.145944 git.c:460 trace: built-in: git config --bool mergetool.vimdiff.trustExitCode 10:46:08.168910 exec-cmd.c:237 trace: resolved executable dir: C:/Program Files/Git/mingw64/libexec/git-core 10:46:08.170910 git.c:460 trace: built-in: git config mergetool.vimdiff.layout 8 files to edit merge of a file.txt failed