uawdijnntqw1x1x1
IP : 216.73.216.235
Hostname : www.vorobey-market.ru
Kernel : Linux www.vorobey-market.ru 3.10.0-514.el7.x86_64 #1 SMP Tue Nov 22 16:42:41 UTC 2016 x86_64
Disable Function : None :)
OS : Linux
PATH:
/
home
/
..
/
usr
/
src
/
..
/
libexec
/
..
/
src
/
..
/
src
/
..
/
src
/
..
/
src
/
..
/
libexec
/
git-core
/
mergetools
/
kdiff3
/
/
diff_cmd () { "$merge_tool_path" \ --L1 "$MERGED (A)" --L2 "$MERGED (B)" \ "$LOCAL" "$REMOTE" >/dev/null 2>&1 } merge_cmd () { if $base_present then "$merge_tool_path" --auto \ --L1 "$MERGED (Base)" \ --L2 "$MERGED (Local)" \ --L3 "$MERGED (Remote)" \ -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \ >/dev/null 2>&1 else "$merge_tool_path" --auto \ --L1 "$MERGED (Local)" \ --L2 "$MERGED (Remote)" \ -o "$MERGED" "$LOCAL" "$REMOTE" \ >/dev/null 2>&1 fi status=$? }
/home/../usr/src/../libexec/../src/../src/../src/../src/../libexec/git-core/mergetools/kdiff3