Daniel@DESKTOP-0AL3K2A MINGW64 ~/Documents/Git/daniel (master)
$ git merge titulo
Auto-merging index.html
hint: Waiting for your editor to close the file... 0 [sig] bash 1968! sigpacket::process: Suppressing signal 18 to win32 process (pid 16012)
950689 [sig] bash 1968! sigpacket::process: Suppressing signal 18 to win32 process (pid 16012)
174158740 [sig] bash 1968! sigpacket::process: Suppressing signal 18 to win32 process (pid 16012)
175545636 [sig] bash 1968! sigpacket::process: Suppressing signal 18 to win32 process (pid 16012)
176013103 [sig] bash 1968! sigpacket::process: Suppressing signal 18 to win32 process (pid 16012)
176435760 [sig] bash 1968! sigpacket::process: Suppressing signal 18 to win32 process (pid 16012)
176823854 [sig] bash 1968! sigpacket::process: Suppressing signal 18 to win32 process (pid 16012)
177322698 [sig] bash 1968! sigpacket::process: Suppressing signal 18 to win32 process (pid 16012)
177913539 [sig] bash 1968! sigpacket::process: Suppressing signal 18 to win32 process (pid 16012)
185379408 [sig] bash 1968! sigpacket::process: Suppressing signal 18 to win32 process (pid 16012)
Merge made by the 'ort' strategy.
index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
