Mercurial > hg
view tests/test-issue612.out @ 7665:950484f05f16
Update win32 merge tools configuration
Add WinMerge and Beyond Compare 3 to default merge tools configuration.
Fix TortoiseMerge configuration.
author | Pascal Quantin <pascal.quantin@gmail.com> |
---|---|
date | Sat, 17 Jan 2009 18:51:40 +0100 |
parents | 368a4ec603cc |
children |
line wrap: on
line source
adding src/a.c moving src/a.c to source/a.c 1 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head ? src/a.o merging src/a.c and source/a.c to source/a.c 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) M source/a.c R src/a.c ? source/a.o