equal
deleted
inserted
replaced
772 space |
772 space |
773 # hg stat |
773 # hg stat |
774 M f |
774 M f |
775 |
775 |
776 Issue3581: Merging a filename that needs to be quoted |
776 Issue3581: Merging a filename that needs to be quoted |
777 |
777 (This test doesn't work on Windows filesystems even on Linux, so check |
778 #if no-windows |
778 for Unix-like permission) |
|
779 |
|
780 #if unix-permissions |
779 $ beforemerge |
781 $ beforemerge |
780 [merge-tools] |
782 [merge-tools] |
781 false.whatever= |
783 false.whatever= |
782 true.priority=1 |
784 true.priority=1 |
783 true.executable=cat |
785 true.executable=cat |